Fixed bug whereby a new environment could not recognise the projectconway directory. Paired by Michael and Richard

The bug was fixed by changing the directory from which setup.py
is run for development inside the makefile. All tests now work.

(Bug#96)

 Please enter the commit message for your changes. Lines starting
Removed TimeSlot table from web app database. Paired by Michael and Richard.

(Feature #97)
Integrated TimeSlot data into Run table. Paired by Richard and Michael.

Data that had been in the TimeSlot table is now in the Run table according
to the new database design (Feature #98).
Contact information on setup.py added. Paired by Richard and Michael.

The setup.py file in the ProjectConway directory has been updated  with
information on who wrote the project, where the project can be found and
how to contact the authors. This information will be added to the PKG-Info
file next time the web application is set up for development.
Merge pull request #15 from richlanc/develop

Merge local develop into group develop