layout work
Merge branch 'jake'
more layout changes
Merge branch 'master' of github.com:vanderhoop/ripest_tomatoes
Merge branch 'jake'