Merge pull request #47 from nickpassarella/master

New Item form, vendor show, menu item show, added some navigation links
Merge pull request #48 from nickpassarella/master

Added a link to all vendors on home page (temporary)
added a favicon
Merge https://github.com/lunchpad/lunchpad.us
pulled in from org repo
rolify, cancancan, travis
Merge pull request #49 from deedeelavinder/master

3 commits
moved .travis file
Merge pull request #50 from deedeelavinder/master

moved .travis file
chronic
Merge pull request #51 from deedeelavinder/master

chronic
c'mon travis
Merge pull request #52 from deedeelavinder/master

c'mon travis
travis, 11; me, 0
Merge pull request #53 from deedeelavinder/master

travis, 11; me, 0
this is it
Merge pull request #54 from deedeelavinder/master

this is it
merged conflicts