mid reroute
Reroute stuff
Merge branches 'pholey-rewrite' and 'rewrite' of github.com:armet/python-armet into pholey-rewrite
uncommented
Fixed small things, we werkzeug now
oops
Merge branch 'rewrite' into pholey-rewrite

Conflicts:
	armet/utils.py
This actually works now, with tests to boot! (i swear)
Added rerouting
Merge pull request #35 from armet/pholey-rewrite

Pholey rewrite