Fixed links to bootstrap; replaced navbar markup with help from http://code.divshot.com/bootstrap3_upgrader/
Update make_it_pretty_with_bootstrap.step
Merge branch 'fix_bootrap_links_and_markup' of https://github.com/JohnB/docs into JohnB-fix_bootrap_links_and_markup