Commenting out development setting that are not requied
Merge branch 'master' of github.com:jbrunson/lif

Merging Jeff's OAUTH work
Merge branch 'master' of github.com:jbrunson/lif
Merging activities model work by Jeff
Add minor change to user model
Merge branch 'master' of github.com:jbrunson/lif
Mergin changes from Jeff
Styling homepage
Centered the homepage box