Working on a fix for the favorites
Fixed the routing to (hopefully) allow the error pages to use Jake's custom ones
Merge branch 'refs/heads/Rails' into development