* an attempt to repair merge
Merge tag '1.2.2' into merge-repair

Release 1.2.2

Conflicts:
	lib/kissmetrics/test.js
	test/index.js
Merge branch 'merge-repair' into reactor
* repaired merge
* updated with release 1.2.2