Merge branch 'master' of https://github.com/bpbond/picarro

Conflicts:
	README.md
README update