updated user edit to update tweet activity and other formats
Merge pull request #46 from andredempsey/nicole

Nicole
resolve merge conflict in UsersController edit method
Merge pull request #47 from andredempsey/andre

Andre
resolved minor issues with users show/edit and links before deployment
Merge pull request #48 from andredempsey/andre

resolved minor issues with users show/edit and links before deployment
Updated slider style & performance
Dark blue buttons look nice
style changes and Ben's changes to the slider bars