Merge pull request #70 from jtwigg/develop

Develop
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
Merge pull request #72 from jtwigg/develop

Develop
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop