basic formatting of scala files
Merge branch 'master' of https://github.com/gangstead/atom-scala-format

Conflicts:
	.gitignore