Merge locals with with config views options
Renaming config.views.options to locals
Normalize indentation (just in blueprint actions for now- will slowly do this going forward as long as it does not clash with pull requests).
Many blueprint tweaks - added comments, pushed refactoring already applied to find, findOne, and create to update.  Started on destroy, but haven't finished yet.
Syntax fixes in requires.
Remove coveralls for now- not working and causes issues when running npm test.
Tests are failing because calling .save() after .remove() is implicitly forcing the record to try and resave the primary key value, which is unique, and is therefore triggering an error.
Along with the update in edge on sails-disk, fixes the failing blueprint test.  New failing test in APIScaffold.test.js.
All tests pass again-- improves fragile bit in APIScaffold.test.js, as well as ensuring that find/findOne are being routed appropriately.
Refactored, added some comments to 'populate' blueprint action.
Fix bug in ok custom response.
Merging locals in a more predictable way
Mid-sentence-- not stable at the moment.
Fixed issue where update blueprint was retrieving recently-updated record by 'id' instead of primary key.
Merge branch 'master' of https://github.com/balderdashy/sails
Changed instances of `Throw new Error` to `return sails.log.error` in pubsub methods.  Insane diff due to .editorconfig.
Fix add blueprint action.
Merge branch 'master' of github.com:balderdashy/sails
All tests pass again.
Allow for non-id child pk values in add blueprint action.