Ship 0.5.2

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Merge pull request #353 from bfirsh/ship-0.5.2

Ship 0.5.2