Add gradle syntax
Merge branch 'master' of github.com:/clinstid/dotfiles
Update syntastic

Conflicts:
	.gitmodules