add untracked dir alias. make copy paste work vimtmux, add vim-haml
Merge branch 'master' of https://github.com/poetic/dotfiles
revert daniel's change