Merge pull request #4 from deanmalmgren/shell-environment

change into /vagrant directory by default
Merge pull request #3 from deanmalmgren/machine-name-fix

fixed inline-comment in config.ini
added a few changes for saml
changed name and added config files needed for simplesamlphp
added ntpd to requirements
added ntpd to the requirements
time zone stuff added
merged changes from common
smoothed out all the kinks in time zone stuff
added remote_templates_root() helper function in utils
Merge branch 'common'
so many little changes
added time zone and other small stuff w/ help from Mike
Merge branch 'common'
small cleanup, added TODO in __init__.py
Merge branch 'common'
merged fixes from common
deleted saml20-sp-remote and updated readme