Merge pull request #5 from jpmontez/master

Further cleanup
Merge branch 'master' of github.com:rcbops-qa/taas