Removed setup.py as this will be created automatically by the pyramid start-up process
Merge remote-tracking branch 'CO600GH/develop' into develop
Merge pull request #5 from richlanc/develop

Deleted setup.py as this will be created by the pyramid installation