Various changes from Feb 6th, 2013. Including not running into walls
Resolved conflicts