added ftyps alias, added ls=ls -f alias, added alias to open unresolved merge conflicts in vim
enable transparency
add path to heroku toolbelt
Merge branch 'master' of github.com:/aerowolf01/dotfiles