Keiths first commit
Merge branch 'master' of https://github.com/keithjohnson-berkeley/klsyn

Conflicts:
	scripts/klattsyn.py