Changes to use 1.8
Add and activate works.
Merge branch 'spigot' into develop
Added README comments and did some cleaning up.