hamlbars additions and new aliases
Merge branch 'master' of github.com:mrjamesriley/dotfiles
merged in changes