soft tabs
Merge branch 'unstable' of github.com:andrewcsmith/HD into unstable

Conflicts:
	lib/search/trombone_search.rb