Merge pull request #1023 from mattcallanan/master

Update Brisbane 2014
Tweaks for Brisbane 2014