re-org
re-org
fix paths to reflect new location
add multi-host files
fix firewall include
fix db_server
remove unneeded require
more naming fixes
Do a apache2 reload when enabling site
Merge branch 'master' of https://github.com/saltstack-formulas/django-formula