overwrote with Matt's fork
proper base.html plus all of Matt's static files
added no_map to querystring
added no_map to querystring

Conflicts:

	templates/base_redevelop.html
Matt's Fork
Merge branch 'v2' into new

Conflicts:
	templates/base_redevelop.html
put original html file back in.
Merge branch 'new'
Merge branch 'master' into new