It's cool to have uris
Merge branch 'master' of github.com:adelgado/chappelle

Conflicts:
	chappelle.lua
	conf/nginx.conf