Merge pull request #55 from californiavol/master

Merge master into imac-work
added get most recent video func  to videos model
fixed live start time db insert
removed unnecessary db insert of video data
code cleanup
Merge pull request #57 from californiavol/imac-work

Imac work
Merge pull request #58 from californiavol/macbook-branch

Merge pull request #56 from californiavol/master
Merge pull request #59 from californiavol/master

merge from master