Changes for Australis (FF 29)
Switching to new method for creating button (long process...)
Merge branch 'master' of github.com:tbentropy/sixornot