update dependencies
1.1.5
1.1.6
Merge branch 'master' of github.com:tjwebb/sails-backbone

Conflicts:
	package.json