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
installing nose-testconfig in travis
Merge pull request #636 from theresaanna/master

Installing nose-testconfig in Travis
always with the nose-testconfig
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
Merge pull request #639 from eregs/master

Merge latest into release branch