More work on router tests.
Merge pull request #542 from Zolmeister/development

safe deepmerge
Closes e9c3022ef8e4045267a5763f34c4966741abc06a.
Merge branch 'development' of github.com:balderdashy/sails into development
Completd policy chain support.
gruntfile only llinks from linker folder
fixed controller config loading