Merge pull request #21 from andy1138/master

Sync with working heroku
Added travis-ci configuration so the lsug-website can be tested from github
Removes .idea folder
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from filosganga/master

Removes the .idea folder
Merge pull request #24 from andy1138/master

upgrade to scala2.10 and play2.1rc2
Heroku startup includes MongoDB URI and docs on how to configure play
Changed mongodb-casbah-gridfs to use 2.5.0 rather than snapshot dependency
upstream fetch