fix vagrant configuration
add local.py for vagrant
make vagrant behave more like a staging machine
revert to deploying develop to the local vagrant environment
rename local environment to local_vagrant
fix stray references to old local environment name
restore example local settings and gitignore
fix a few remaining stray references to old local vagrant environment name
add note to doc about running highstate twice
correct DB user & name in local vagrant settings
Merge pull request #164 from caktus/fix-vagrant

Make vagrant behave more like a staging server for testing salt locally
Merge branch 'develop' into wkhtmltopdf