Update .gitignore
Update .gitignore
Merge branch 'master' into deployment
Update urls.py
Update urls.py
Merge branch 'master' into deployment

Conflicts:
	bicefalo/bicefalo/urls.py
Merge branch 'deployment'