More extendable handling and santisation of settings
Removed duplicate validation
2.1.4
Merge branch 'master' into minify