Removed parley dependency.
Merge branch 'waterline' of github.com:balderdashy/sails into waterline