merge dev to master

Abandon dev / master workflow for the dirtier master only workflow. This is to make it easier to accept pull requests (until I write up a proper contribute.md)