cleanup junk files
code touch ups
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore