Remove abbreviations file reference, remove noswapfile, add scala stuff
Merge branch 'master' of github.com:jeffknupp/config_files