Add setup and sbt conf
Merge branch 'master' of github.com:ashleyblackmore/dotfiles
Merge both sets of dotfiles