merged nick's
Merge branch 'nickpassarella-master'
merge
added ruby version to .travis file
Merge https://github.com/lunchpad/lunchpad.us
merge
gemfile lock
Merge pull request #57 from deedeelavinder/master

changed .travis file