Added some improvements.

rm_pics removes all pics in pics dirs
config.txt contains path to out dir
plot.py uses config.txt params
merge1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/grid_constructor.cpp