refactoring the search by keyword into the Organization model via TDD pair programming with JO
working on better test for the map components
slight variation
fixing the maptest issue with checkin lat/lng
updating map to include some labels and updating test to cover that and check that labels appear in gmap4rails generated javascript
pp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Update README.md
sincroning with remote
Merge remote-tracking branch 'upstream/master'
local authentication features