Merge pull request #1 from HypatiaStation/master

Updating from main 12nov14
Merge pull request #2 from HypatiaStation/master

Map fix
Map bug fix 2 - Shuttle fixes? Item variations

+Possible fix to shuttle controller errors.  Needs testing.
+Fixed missing walls on Escape Shuttle
+Added Multi-Rocket Launch shoulder mounted rocket launcher (Instance of
normal Rocket Launcher, but holds two rockets)
+Added Colt .45 (Instance of the semiauto Colt M1911, but starts with
normal .45 rather than .45r)
-Mij
Minor map fix

Found a step_x in the map file set to 0. switched it to pixel to be
safe.