Ship 2.1.0

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

Ship 2.1.0