lessons learned from titan
Merge pull request #678 from shackbarth/mocha

lessons learned from titan