Cleaning up and adding devel branch

Preparing for the next release!