Merge 3.1 update from upstream
Adds /hermes courtesy of Swift

Update POM also
Merge branch 'master' of https://github.com/HydraSMP/godPowers