Merge branch 'master' into bushy-beard-feature
Updating non feature info.
Merge remote-tracking branch 'origin/master' into bushy-beard-feature
Merge remote-tracking branch 'origin/master' into bushy-beard-feature

Conflicts:
	non-feature.txt
Merge pull request #3 from amcbrearty/bushy-beard-feature

Non feature info updates.