Merge pull request #1 from ollieflumeland/master

get latest changes
LOADS OF STUFF!!!
Merge pull request #2 from jemble/master

tuesday afternoon updates