Merge pull request #138 from kheang/master

Clean ups
Merge pull request #139 from kheang/master

precompile
Merge pull request #140 from kheang/master

changes from heroku
seeds again
Merge https://github.com/lunchpad/lunchpad
merge
Merge pull request #141 from deedeelavinder/master

seed file
added edit_user path
Merge pull request #143 from kheang/master

clean ups and help page
added data points for front page
Merge pull request #144 from kheang/master

calendar updates; other misc items
Merge pull request #142 from deedeelavinder/master

added edit_user path
Merge pull request #145 from kheang/master

menu items / vendors
fixed code in order form to properly total for single day only
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merging
mid working on sign in page
Merge pull request #146 from nickpassarella/master

merging to deploy
added new seedfile
handled conflict
added links