Merge pull request #936 from brooksryba/develop

Develop
changes
merge
testing js
testing js
Woot
OMG A WORKING TEST SUITE