parital ajax implementation on user dashboard; interim commit
Merge pull request #23 from andredempsey/nicole

Nicole
resolving merge conflicts
Merge pull request #24 from andredempsey/andre

Andre
adding changes for twitter auth and routes from CT