Merge from jnewman/master.
Merge branch 'jnewman-master'

Conflicts:
	package.json
Switch to grunt test instead of default.