Async test should fail, this is a genuine bug
Merge branch 'master' into handlebars

* master:
  Async test should fail, this is a genuine bug

Conflicts:
	test/dioramaCommand.coffee