Repository building functional again
Merge branch 'update_merge' of https://github.com/mspaulding06/arado into update_merge

Conflicts:
	setup.py