Merge pull request #6 from ChillOutHack/adam

map, mapandchart views working
keyerror_fix
Merge branch 'master' of https://github.com/ChillOutHack/chillout_app
fixes
Add in timeline
Merge remote-tracking branch 'origin/master' into vik/timeline-front
Merge pull request #8 from ChillOutHack/vik/timeline-front

Vik/timeline front
added presentation ticks for each obj in sample.js
Merge branch 'master' into adam