most recent changes
Merge branch 'master' of https://github.com/cljohnson/lsearch

Conflicts:
	lsearch/settings.pyc

removed secret files