Commit fc36800ecd8f8903f4cf7e40a54966855fdd4b76

Edward Thomson 2013-08-08T13:16:13

Get rid of some quick hacks