Some changes to TraitPopup that we most likely won't use and added settings folder to gitignore
Merge branch 'master' of github.com:Ongion/betrayal