Merge pull request #59 from nphillips/master

The update we made together to reinstate the Bootstrap version of the nav
debugging a foundation js problem
Merge pull request #60 from nphillips/master

Created options for the Live Stream buttons
committing to merge