More work on router tests.
Closes e9c3022ef8e4045267a5763f34c4966741abc06a.
Merge branch 'development' of github.com:balderdashy/sails into development