Merge branch 'master' into develop
Throw on bad key
Add helper methods for getting resources; Misc minor fixes
Merge branch 'master' into snake