changing layout for 2 columns

using stacked navigation along side
edits
more edits/changes
updates to layout

placed tabs inside main content area, can't get them to work though.
not sure what I'm doing wrong. :-(
styled stream wrapper

going to put a slider in here
edits/changes

working on video slider
edits/changes

finished basic, no-frills styling, added a generic section below the map
Merge branch '2col-layout' into ladychris-dev

Conflicts:
	app/views/main.html