Updated version number and changelog.
Merge branch 'release/2.1'
Merge tag '2.1' into develop

Updated with taxonomy support and nicer interface.