Merge pull request #4 from indeedeng/master

update from master
Fixing git bug when promoting tests
Merge pull request #12 from maltosaurus/master

Fix for git bug when promoting tests