added oF updates from Wednesday night
Merge branch 'master' of https://github.com/mfadt/mfadt-installation-2014