using github repo for conque
making trailign white space highlighter less abrasive color
added gradle and groovy support
clean up unused stuff
Merge branch 'master' of github.com:sfrdmn/vim-config

Conflicts:
	plugin/settings.vim