Third person camera fixed.

Merge worked before.  But build was messed up.  After you get the new
file, ALWAYS rebuild the entire solution for things to work.