Cleaned up my scala test template
Merge branch 'master' of https://github.com/derekwyatt/vim-config

Conflicts:
	xpt-personal/ftplugin/scala/scala.xpt.vim
Setting up for Autotags plugin