updates to aliases
Merge branch 'master' of git://github.com/mrjamesriley/dotfiles
updated vim-haml to latest version