minor document changes.
removed unused swutches from base.py and moved environment variables into __init__.
Merge branches 'dev' and 'master'
removed env variables from base.py
salt-master in a vpc.