rerouting
Merge branch 'rewrite' of github.com:armet/python-armet into rewrite

Conflicts:
	armet/api.py