Merge branch 'macbook' of git://github.com/nbouscal/dotfiles into macbook

Conflicts:
	.gitignore
	.gitmodules
PHP/HTML indentation for vim
update .gitignore
gj, gk, g0, g$, go, gO