update to JVM settings and removing grails 1.3 test result parsing from
vim execution
Merge branch 'master' of github.com:sjurgemeyer/dotfiles

Conflicts:
	.vim/plugin/grailsScripts.vim