removed stray div tag from comments
Merge branch 'bootstrap-grid' of https://github.com/hallme/scaffolding into bootstrap-grid