Removed setup.py as this will be created automatically by the pyramid start-up process
Added Pyramid Alchemy Project to the source code (Feature 42).
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
Bug Fix. Programmed by Michael.

Fixed the bug whereby the server wouldn't run because the database could
not be initialised (Bug#67). Server does not work fully, because there
is no database in place, but it will now run.
Merge branch 'bug#67_initialize_{project_name}_db' into develop
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

Pulling this