Cleaned some code up
Merge branch 'master' into merge

Conflicts:
	CPAC/sca/utils.py
Merge branch 'merge'