Merge branch 'master' into better_nginx_regex

Conflicts:
	README.md
Merge pull request #10 from brycied00d/better_nginx_regex

Better Nginx Path Regexes
Merge branch 'master' into running