fixed versions of rspec etc to make sure tests pass
ruby 2.1.1
rails 4.1.0
update travis to use ruby 2.1.1
Merge pull request #77 from Skud/upgrade-ruby

Upgrade ruby
add additional content to map popups
remove watch button
Change to 2 spaces in scss files. Plural check for person/people. Declare variables.
Merge pull request #78 from jdeblank/feat-60733760-map-popup

Feat 60733760 map popup
Merge branch 'dev' of github.com:3000acres/3000acres into cms-snippets

Conflicts:
	.ruby-version
	.travis.yml
	Gemfile
	Gemfile.lock