make flask's jinja play well with angular
map working, and added time series to map page for presentation
added mapandchart view for presentation
updated server to resolve conflict before merging
Merge branch 'master' into adam

Conflicts:
	templates/main.html
Merge pull request #6 from ChillOutHack/adam

map, mapandchart views working