updates all over the place
Merge remote-tracking branch 'upstream/master'
changed bussells email to mine for testing