Removed setup.py as this will be created automatically by the pyramid start-up process
Merge pull request #4 from leahcimNosliw/develop

Added Pyramid Alchemy Project to the source code (Feature 42).
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
Update .gitignore to ignore the env folder and vim swap files
Merge pull request #7 from richlanc/develop

Update .gitignore to ignore the env folder and vim swap files
Merge pull request #8 from leahcimNosliw/develop

Develop
Merge pull request #2 from CO600GOL/develop

Develop