Added Josh, our noble character for encouragement. Name may change
Merge branch 'master' of https://github.com/poofytoo/aubergine