updates
Merge branch 'master' of https://github.com/KyleBrandon/vim-maven-plugin

Conflicts:
	plugin/maven.vim
Merge branch 'master' of https://github.com/KyleBrandon/vim-maven-plugin

Conflicts:
	plugin/maven.vim