Rolled version number to 2.1 and updated changelog