Updatin
Merging
Update to remove the -t flag from editor settings -- it's seriously screwing with stuff.