Added some maven plugins to hopefully get the auto build stuff to work.
Merge remote-tracking branch 'origin/master'