Merged Changes from 1.3.2

Merged in the changes going from 1.2.9 of FTB Launcher to 1.3.2 FTB
Launcher