1.6.x

Updated almost everything to work in 1.6.x. The capes code doesn't work currently due to removal of cloakUrl and Athame isn't 100% functional.