add maya
Merge branch 'master' of github.com:benley/dotfiles
add haskell if it's there
Merge remote-tracking branch 'origin'
ffs turn off solarized