Replaced godin plugin with apache shade, uber jar is now a little smaller, putting that down to scope/de-duping.
Formatting got screwed up in eclipse, 2 vs. 4 spaces
Fixed build failure
No longer need specific version of maven in travis
Merge pull request #240 from garethf/issues/239

Issues/239
Merge branch 'master' of https://github.com/buddycloud/buddycloud-server-java into issues/243

Conflicts:
	pom.xml