check point initial engine work before boostache reshuffle
Merge branch 'master' of github.com:JeffGarland/liaw2014 into rename
Merged three different branches with conflicting differences. Everything is compiling and tests passing in the same state as previous.
Merge branch 'master' of https://github.com/JeffGarland/liaw2014