Merge pull request #19 from MooreJesseB/master

Lotsa stuff.
Added image capabilities to marker info window
Merge branch 'master' of git://github.com/TeamGlorious/explorify

Conflicts:
	Gemfile
	Gemfile.lock
Jesse's Merge
Merge pull request #20 from SalamanderMike/master

Added pictures capability to markers' info window
my updates
Merge branch 'master' of git://github.com/TeamGlorious/explorify into WIP
Merge pull request #21 from sbokaie/WIP

Wip
minor tweaks after addition of new styles