Merge pull request #77 from bigspring/1.0.2

1.0.2 – update Bootstrap to 3.0
Merge branch '1.1.0-wip'
Merge branch 'master' into 1.1.0-wip