Working on Bootstrap integration, CSS and branding
Merge branch 'master' into kenny

Merging JS changes into Bootstrap and CSS changes
Merge pull request #10 from kplandes/kenny

Kenny