Merge pull request #634 from theresaanna/master

Egg
Use blocks in the about page to allow for customization
Merge pull request #635 from cmc333333/about-blocking

Use blocks in the about page to allow for customization
Merge pull request #636 from theresaanna/master

Installing nose-testconfig in Travis
Merge pull request #637 from theresaanna/master

Travis, please always install nose-testconfig
Minor edits to about page
Office of FR, remove 'past' as we also show future
Merge pull request #638 from cmc333333/about-blocking

Tweaks to "About" content
getting js unit tests running again
rearranging js unit tests
updating require script for unit tests, moving to better, licensed konami
more js unit test cleanup
more js unit test cleanup
fixing supplement to appendix header bug, js unit tests passing