scipy2014 hosted at /scipy2014
add _urls.py
fix nginx
final tweaking
separate static and media files for easier deploys
install system packages
style
Merge branch 'non_root' into non_root2

Conflicts:
	deployment/nginx_conf_template
	fabfile.py
	scipy2014/urls.py
initial update to deploy scritps
add tasks
pep8
collect username
spiffy up deploy scripts
explicit ssl cert/key paths
fix link to plotting contest
remove extra semicolons
Merge pull request #41 from scipy-conference/non_root2

Non root2