Build fixes

To get the master branch to compile from the command line (for automated builds), I needed to make all of these changes. 

.gitmodules weren't setup right, primarily, but also had to make sure I had proper commits pegged, etc.