mayor restructuring to accomodate plug-in architecture
Merge remote-tracking branch 'origin/master'