revised the way that the footer displays in sub 640 layouts
Adding the latest from upstream master

Merge branch 'master' into email-field-tweaks
Merge pull request #14 from marcnischan/email-field-tweaks

Email field tweaks