scenario updates from mtg 02_06_14
Merge branch 'master' of https://github.com/Project6/Planit