cleanup and small additions
simplifying module and ship implementations and updating everything for unity 4
simplifying module and ship implementations and updating everything for unity 4
resolving conflict