v2.1

Closed May 9, 2017 100% complete

Cleanups, enhancements and bugfixes for new v2.x stream.