preliminary work on blocking users access to stuff that's not theirs
Merge pull request #24 from SalamanderMike/master

Balloon Markers
bug fixes in the trips controller
root fixed
Plug holes in user access
more user bulletproofing
working on merge issues
duplicate p tags solved
Full non authorized user protection added
Merge pull request #26 from sbokaie/master

Merge issue should be solved
Merge branch 'master' of github.com:TeamGlorious/explorify

recursive merge resolved
Merge pull request #27 from MooreJesseB/master

Add full non-authorized user access.
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Merging Jesse
Conflicts:
	app/views/shared/_center_col_header.html.erb
Still working on dom