Ship 2.0.7

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Merge pull request #11 from orchardup/ship-2.0.7

Ship 2.0.7