Merge remote-tracking branch 'snide/master' into move-javascript-to-bottom
Fix spacing after the figure and figure center alignment.
Re-generate CSS files.
Merge remote-tracking branch 'snide/master' into move-javascript-to-bottom
Removing incorrectly merged commits
lock wyrm version while i update to fa to 4.0
Fixed sass to work with upstream version of wyrm.
Merge pull request #94 from Lukas-Stuehrk/master

Fixed sass to work with upstream version of wyrm.
get the theme working with fa. #94
might help if i added the fonts
well that's one thing off the todo
fixed #92
css for #92
Merge branch 'fix_image_center_alignment_and_spacing' of github.com:Kami/sphinx_rtd_theme into Kami-fix_image_center_alignment_and_spacing

Conflicts:
	sphinx_rtd_theme/static/css/badge_only.css
	sphinx_rtd_theme/static/css/theme.css
Fix icon/fa switch in footer
Add icon CSS back in for old doc builds
backwards compat for font awesome 3.0 for fonts sphinx_rtd was using.
fixes #95
Merging upstream
Merge branch 'move-javascript-to-bottom'

Conflicts:
	Gruntfile.js
	README.rst
	sphinx_rtd_theme/layout.html
	sphinx_rtd_theme/static/css/theme.css