Stricter requirements
Merge branch 'develop' into uritemplate

Conflicts:
	setup.py
Ternaries are awesome!
Lint!
Start adding templates to Repository objects