Minor Cleanup
Merge branch 'master' of github.com:Dennizz/rulemaker

Conflicts:
	FirewallData.py
Minor Cleanup