minor changes.
Merge branch 'jwhite2'

Conflicts:
	.gitignore