Started tidying up.
Tidy up and wiring in variables.
Change to Python 3.4
Merge pull request #1 from mnorbury/tidy_up

Tidy up