fixed errors that occurred during merge.
added LaRC/TES examples
Merge branch 'issue69' into devel
Merge branch 'devel'

Conflicts:
	testing/test_examples.py
fix the plot file name

better to just go off of __file__ than anything else
adjusted title size
Merge pull request #5 from quintusdias/master

sync with quintusdias master