Merge pull request #1 from seanbradley/develop

Automatic merge of develop into master.
Adjust USERNAME_FIELD in auth/models.py
Create artists module; relocate UserDetailView to /artists; update artists/urls.py, etc.
Merge master into develop. Fix merge conflicts.