Merge branch 'master' of github.com:Slowpoke101/FTBLaunch
Merge branch 'master' of github.com:kaendfinger/FTBLaunch
Update some updater stuff