Merge pull request #97 from acmetech/master

Fixes #96 and other minor updates
update to Bootstrap 2.3.2
Fixes #101