[TASK] Added some grunt work
[TEST] Dummy test
Merge branch 'master' into multiline

Conflicts:
	lib/log.js
Some working tests
Initial multiline support
Color is back