added .cabal/bin and ~/local/bin to PATH
Merge branch 'master' of github.com:benjaminfjones/dotfiles