0.10.2
Merge branch 'master' of github.com:balderdashy/sails
Merge branch 'master' of github.com:balderdashy/sails

Conflicts:
	package.json
Merge branches 'master' and 'master' of github.com:balderdashy/sails