updating uwsgi to pass in confcontent
Merge branch 'django1.7' of https://github.com/rdiankov/openrave.org into django1.7