bits and bobs
whoops. missed these
Merge branch 'master' of https://github.com/benvan/.dotfiles

Conflicts:
	bashrc
removed vim-haml