Including plugin.yml, updated Maven and Gitignore a bit.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'