Intial steps to extract mothership.
Merge conflict resolved.
Moved template suggestions into templates folder, removing mothership duplicates/overrides.
Supressed post-partum error messages.
Merge pull request #24 from mlabrecque/7.x-2.x

Proposed direction for Parrot 2