Modifications to setup.py
Merge branch 'master' of https://github.com/stuwilkins/CableDatabase
Merge branch 'master' of https://github.com/stuwilkins/CableDatabase

Conflicts:
	setup.py
Merge branch 'master' of https://github.com/stuwilkins/CableDatabase
Merge branch 'master' of https://github.com/stuwilkins/CableDatabase
Merge branch 'master' of https://github.com/stuwilkins/CableDatabase
Fixed bug in cable count library function (no ' in database select)