committing oct25-2014 ready for proofing and testing
Merge branch 'master' of https://github.com/themagpimag/magpi-issue28

ready for proofing and testing oct-25