fixes englishtown/gudstrap#71
Merge branch 'develop' of https://github.com/englishtown/bootstrap into develop
fixes englishtown/gudstrap#72
Merge branch 'develop' of https://github.com/englishtown/gudstrap into develop
Merge branch 'develop' into gh-pages