Merge pull request #216 from willsowerbutts/tinyfixes
authorEtchedPixels <alan@etchedpixels.co.uk>
Fri, 26 Jun 2015 21:23:44 +0000 (22:23 +0100)
committerEtchedPixels <alan@etchedpixels.co.uk>
Fri, 26 Jun 2015 21:23:44 +0000 (22:23 +0100)
A number of small fixes


Trivial merge