adjust README
Update .gitignore
better base.html
better default urls
Merge branch 'master' of github.com:asmaps/django-project-template
server static via urls
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	README.rst