Moving to single branch scheme.

Having multiple branches in the main repository has been confusing in the past. I'm going to merge the development branch into a single master branch, continue development on forked repositories, and use pull requests to merge in changes.