Phil Gates-Idem 8fb26da1ac Merge branch 'v1.0'
Conflicts:
	package.json
2014-06-05 14:34:04 -04:00
..
2014-06-05 14:34:04 -04:00