Merge pull request #144 from jpecht/master

alldata - flexible companion length
made zoom buttons responsive to changes in header height.  "Access More Data" shows only an icon under 800px width
merged changes
more restructuring for flexible companions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/main.js