Merged master in

Merged master in BEF, resolved map conflict.
Fixed my derp in surgery.
Moved medbay doors around for better flow. 
https://dl.dropbox.com/u/70048025/SS13/Maps/m.png