Solver compiles now [for real this time]

Fixed some syntax and replaced " "'s with "_"'s.  Also, I'm in the lab
somewhere right now.  Some one text me or something.  (403)667-0090.
Thanks haha.
Revert "Solver compiles now [for real this time]"

This reverts commit f2501ad42b1031e6366c9675f3bebc1c328f783c.
Merge remote-tracking branch 'origin/master' into nathan