Merge branch 'collapsedState'
Merge branch 'release-0.2'
Merge branch 'master' of github.com:marbindrakon/eve-wspace
Merge branch 'release-0.2.2'
Merge branch 'develop'
Increment README version
Merge branch 'hotfix-readme'
Merge branch 'master' into develop
Add python-mysqldb which is required
Merge pull request #99 from Graham42/develop

Vagrant up fails: missing dependency
Added MySQL-python to requirements.txt
Added a note to put underscores_in_headers in nginx.conf if you have multiple virtual domains.
Changed gunicorn.conf under supervisord to listen on 127.0.0.1 instead of 0.0.0.0 for security.
Added second = because I'm bad.
Split requirements.txt for MySQL and PostgreSQL as suggested. Added notes about using PostgreSQL in the docs.
Actually added the split files ._.
Merge pull request #101 from Zumochi/develop

Split requirements.txt, note about virtual domains in nginx
Add toggle to map k-k connections in the IGB
Merge branch 'kspaceigbmapping' into develop
Merge branch 'develop' of github.com:marbindrakon/eve-wspace into develop