misc
Merge branch 'master' of github.com:jrnold/civil_war_era_findata

Conflicts:
	doc/source/pages/misc.rst