refactor to hash-map & zippers
Merge branch 'master' of github.com:niquola/arroute

Conflicts:
	src/arroute/core.clj