2.1.1 Release

A maintenance release that fixes several bugs, adds a few features and cleans up a little.