Merge pull request #211 from jayschwa/bootstrap-v3.3.1

Upgrade to Bootstrap v3.3.1