Merge pull request #197 from RichardLitt/master

Bootstrap 3