getting ready for deployment
preparing for production
changed gitignore file
updated requirements
changed requirements
changed requirements.txt
fixed views
changed prod settings
Merge branch 'master' of http://www.github.com/taliesin-oppenheimer/socks

Conflicts:
	requirements.txt
	socks/wsgi.pyc
	users/views.py