Removing workspace.xml from the repo, which causes conflicts with IDEA.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   .idea/misc.xml
#	deleted:    .idea/workspace.xml
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/.name
#	out/
#	website/website/__init__.pyc
#	website/website/settings.pyc
#	website/website/urls.pyc
#	website/website/wsgi.pyc