Initial cleanup, reorg for 2014 presentation.
Merge develop and master mess into one