Bootstrap3

Bring the bootstrap3 changes into the dev branch (officially!)

PT: https://www.pivotaltracker.com/story/show/57539504