Merge branch 'develop'
Merge branch 'release/1.2.1-beta'

Conflicts:
	setup.py
Changed setup.py to use find_packages()
Fixed a bug where URIs were incorrectly formatted
Bumped version to 1.2.1.1-beta
Merge branch 'hotfix/1.2.1.1-beta' into develop