Merge locals with with config views options
Renaming config.views.options to locals
Merging locals in a more predictable way
Merge branch 'master' of https://github.com/mattliegey/sails into mattliegey-master
Added test for config.views.locals.