Merge pull request #1 from paulcpederson/master

Adding some styles and an in-page search box
update references to css/js files
fixing conflicts