cleaning up test
fixing conflicts
cleaning up the shitty error messages
Merge pull request #8 from cspray/error-messages

Clean up routing error messages