Merge pull request #10 from draycox/master

getting everything up to date
Merge pull request #11 from draycox/joey6

Merge pull request #10 from draycox/master
Merge branch 'master' of https://github.com/draycox/hackday
Merge pull request #13 from draycox/joey7

Merge branch 'master' into joey7
Merge pull request #12 from draycox/master

Bringing JOEY7 upto date with master