Merge pull request #31 from andredempsey/andrew

no changes made, pushing to Andre
Updated routes for twitter oauth callbacks
Merge pull request #32 from andredempsey/jasons-oauth

Updated routes for twitter oauth callbacks
push for merge
artisan script functional; may need additional changes/user dashboard
resolving conflicts
Merge pull request #33 from andredempsey/nicole

push for merge
Merge branch 'master' into andre
Merge pull request #34 from andredempsey/andre

Andre
Chris changed stuff.