Move everything useful into master branch

All code will be on the master branch from now on.