Merging #develop into #next after 0.6.1 release

- Resolved conflicts
- Disabled the command jslint.js unit test which is causing the unit test suite to fail (command tests are no longer used in #next, and should be removed at some point - added a card to Trello)