fucked up removing tastypie, fixed now
Merge branch 'master' of 172.16.8.183:smoke

Conflicts:
	dev/config.js
Merge branch 'master' of https://github.com/benbreedlove/smokejs
take care of lint warnings
remove pretend unit tests