Basic changes for Stretch 2014

just a clone with some changes from 2013 - will do the changes incrementally