Remove git garbage

Future features should be developed in their own branches so as not to
“break the build”.
Step 4 complete
Merge branch 'master' into Step-#7