Better routes
Merge branch 'master' of github.com:joelsawyer/wishbott