undo RC2 update
undo RC2 update
Merge branch 'bootstrap3' of https://github.com/davidlyons/boilerplate into bootstrap3