begun work on splash page and fixed up some edit/noedit behaviors
Merge branch 'chris'