adding picky
Merge branch 'master' of github.com:djheru/marionette

Conflicts:
	assets/js/vendor/backbone.picky.js