Merge pull request #63 from dalers/master

Final infrastructure cleanup for a while