Some settings tweaks.
Merge branch 'portage' of github.com:BuildmLearn/BuildmLearn-Toolkit into portage
Added missing stuff.