Merge branch 'develop'
Update Bootstrap Version

Update Twitter Bootstrap to v2.2.2. This includes all css and full js
file.
Added script tag for bootstrap.js (temp)

I will assume that this should actually be made part of some build
process, but for the purposes of solving this issue, I put the script
tag here.
Added missing class to div

.collapse was removed here, for testing, by Stephen. I merely put it
back in place.
initial install

Nothing pertaining to nav issue. Any changes here were due to having to
install the app to confirm correct function of the responsive nav.