OK, I just merged your pull-requests.

I think I didn't break anything ;)

I didn't have a .gitignore because I have that configured in .git/info/exclude, but I guess it's better this way.

Thanks!