disabled timeline moving, just disable zoom when mousedown;
brush and zoom work together now;
Merge branch 'brush' into gh-pages

Conflicts:
	js/timeline.js