adding updates to master
Merge branch 'master' of github.com:shawnbro/quick_shark
Merge branch 'master' of github.com:shawnbro/quick_shark
improved path semantics, refactored routes
more refactoring
Merge branch 'master' of github.com:shawnbro/quick_shark
complete merge