Merge pull request #9 from starverte/v1.1.1-wip

Merge from v1.1.1-wip
Upgrade to Bootstrap 3.1.1
Merge pull request #145 from mbeall/master

Upgrade to Bootstrap 3.1.1