Merge branch 'timeplot_auto_scroll' of github.com:zdomke/pydm into ti…

…meplot_auto_scroll

Conflicts:
	pydm/widgets/archiver_time_plot.py