minor style changes
derp
derp
double bump
Merge branch 'master' into style2

Conflicts:
	package.json
revert some things
Merge pull request #4 from Clever/style2

minor style changes