Refactored routing and redirecting to be in one place
Merge branch 'master' of github.com:puffball/puffball