edited logging
merge
Removed ~ from error messages
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2014-tester