linux update 29/8/14
Merge branch 'master' of github.com:Chris35Wills/Python_scripts