Map Fix 09NOV2014

Redone piping.
Merge pull request #298 from skull132/development

Map Fix 09NOV2014