Merge pull request #48 from californiavol/master

merge master into macbook-branch
changed height of small screen video
added font awesome can using netdna.com
added captioningplugin.swf to directory - not yet installed

also made a few minor adjustments to styles and layout
exported videos sql
Merge pull request #49 from californiavol/macbook-branch

Macbook branch
Merge pull request #50 from californiavol/imac-work

Merge pull request #47 from californiavol/master
Merge pull request #51 from californiavol/master

merge imac work and master