Merge branch 'master' into parent-master
anal vince is anal (& added spreadsheet gem)
Merge remote-tracking branch 'origin/master' into gmaps4rails_test

Conflicts:
	Gemfile
can has xls! resolves issue #1
Merge!
Merge branch 'parent-master'

Conflicts:
	Gemfile