Merge pull request #576 from jtakayama/master

Adding additional documentation on Issue 575 and Vagrant behavior changes since 1.3.0,
Merge branch 'master' of http://github.com/jtakayama/makahiki
Merge branch 'master' of http://github.com/csdl/makahiki into django-1.6-migration
Adding environment variable MACHINE_IS_VAGRANT to makahiki_env.sh, to be used by settings.py to set the allowed URLs for the virtual machine.
Removed "MACHINE_IS_VAGRANT = True" line left over from testing.
doc/installation-makahiki-vagrant-configuration-vagrant.rst: Added note on change to settings.py and ALLOWED_URLs after upgrade to django 1.6.
makahiki/settings.py: Added localhost and 127.0.0.1 to ALLOWED_HOSTS - not tested on Heroku yet.
Merge pull request #580 from jtakayama/django-1.6-migration

Vagrant ALLOWED_HOSTS fixes for Django 1.6 upgrade.