Eliminated the default - I don't remember why
Merge branch 'master' of github.com:derekwyatt/dotfiles
Fixed the EDITOR variable
Merge branch 'master' of github.com:derekwyatt/dotfiles
Added SBT permgen setting. Added SML to the path on mac