Setup Setuptools
Ammend Finish program
Merge branch 'master' of http://github.com/bucknerns/concordance

Conflicts:
	setup.py