took out neighbor deal
missed inderscore
final tweak of visits
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/households/_visit_fields.html.haml
	app/views/visits/harvest.html.haml
Merge pull request #150 from tbrooke/master

Minor tweaks