DSA-33: factored out common settings
DSA-33, code cleanup
Merge pull request #4 from thehackerati/DSA-33

DSA-33: factored out common settings
Merge branch 'master' into DSA-24

Conflicts:
	.gitignore