Merge pull request #102 from acmetech/master

Fixes #101 and update to Bootstrap 2.3.2