adding documentation, beta-release of 2.1 and tidying things up a bit