Added sortable name to Users
Merge pull request #90 from joshuadutton/master

Stop tracking .iml files
Fixed bugs and unused imports found and various issues.
Merge pull request #92 from matthewrice345/master

Fixed bugs and unused imports found and various issues.
Merge pull request #91 from hhoang/master

Added sortable name to Users
Fixed some encoding errors recently introduced.
Fixed a spelling error.
Merge pull request #93 from matthewrice345/master

Fixed some encoding errors recently introduced.
Merge pull request #4 from instructure/master

Update 11-6-14