Update server test to be more clear on fail
Switch to grunt-browserify
#cleanup
Pull in external changes

Router no longer locked into parsing routes JSON