cleanup
Merge branch 'carfax' of github.com:raymyers/dev-search into carfax

Conflicts:
	.gitignore