Cleanup branches to make the project more maintainable. #8
Description
There are a few legacy branches kicking around that make it tough for developers to checkout and start work on the most recent source. They should be all cleaned up so that master is the only long running branch.