Updated colors version
Added grunt watch task
Working on fixing vagrant setup
Merge branch 'master' into develop

Conflicts:
	package.json
Update the contributing docs
Added actual test runner, and configured grunt task to run it.  Started writing test.
More tests
Merge branch 'develop' into ignore-wp-core