Some tidying up
Accidently changed to localhost somewhere
Merge pull request #72 from christriddle/master

Some tidying up