Moving JS to bottom
Merge remote-tracking branch 'snide/master' into move-javascript-to-bottom

Conflicts:
	sphinx_rtd_theme/layout.html
Renaming block "extrahead" to "inlinejs" and moving to bottom of page.
Restoring "extrahead" block in layout.html
Merge branch 'snide-master' into move-javascript-to-bottom

Conflicts:
	sphinx_rtd_theme/layout.html
Merge remote-tracking branch 'snide/master' into move-javascript-to-bottom
Merge remote-tracking branch 'snide/master' into move-javascript-to-bottom
Removing incorrectly merged commits
Merging upstream
lock down wyrm depencendy while I fix some icon stuff
fix fontawesome hovers, fixes #95
Specify an empty dependencies set in package.json

NPM goes really crazy without this. You'll get a lot of
called_on_non_object errors when trying to perform (even
global) install operations.
Merge pull request #102 from icio/fix/npm-dependencies

Specify an empty dependencies set in package.json
move to contrib-sass, remove contrib-compass reqs
Merge branch 'master' of github.com:snide/sphinx_rtd_theme
remove compass req in readme
update with button and font changes from wyrm
wyrm changes should make css on rtd smaller
Merging upstream
Renaming block inlinejs to footer