Develop

Fixed a few issues with develop compiling cleanly.  It now compiles correctly for me with a clean build and all the unit tests pass.

(PS I realize develop may not be the best place to work from but wanted to see what the 0.8.0 codebase looked like these days)