Random, miscellaneous changes that work some magic that allow Jessie to build AM.
Merge branch 'master' of https://github.com/acquaman/acquaman