Cleanups.
Adding test for importing.
Merge branch 'master' of github.com:azundo/dj-timelinejs

Conflicts:
	timelinejs/templates/timelinejs/import_timeline.html