Add inputformat.py support
Add plotti, update descrp
Merge remote-tracking branch 'origin/master'

Conflicts:
	make_input.py