Tests updated to that "grunt test" runs mocha against whatever environment you want
Merge remote-tracking branch 'origin/master'