Better standards
fix npm start
Merge branch 'master' of github.com:garrows/slacker into patch-1

Conflicts:
	package.json
Various niceness