Fixed some formatting stuff, vs2012 messed up a lot of tab/spaces stuff so we should probably fix that