The tests aren't ready for rspec 3 yet so lets keep it to 2.9 for now
Implementing inclusion of icon options in markers
Provides defaults so that icon_url is the only required icon setting
Merge pull request #1 from TheMetalCode/jasonh/enable_custom_marker_icons

Jasonh/enable custom marker icons
Forgot to uncomment this, sorry
For the anchor settings, it's better to default to [0, 0] than empty arrays since those settings are relative to the marker location
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/leaflet-rails/view_helpers.rb
Recovering from merge with upstream/master
Merge pull request #31 from asmaloney/master

Add configuration for tile layer subdomains
Merge pull request #29 from TheMetalCode/master

Add Marker Icon Options to View Helper