Cleaned up to build. Using new method names.
Merge branch 'master' of github.com:jlturner/Turnpike