Adding hashbang to haml land.
Merge branch 'master' of git://github.com/pyrat/simple_dotfiles

Conflicts:
	zshrc