Merge branch 'master' of https://github.com/maxisi/polHTC

Conflicts:
	data_plots.py
	scratch/data_plots.py
	scratch/plot_data.py