Collisions, bullet fixes, movement updates
Merge branch 'master' of https://github.com/AdamJohnBurns/GameJam-2014