comment out the cities stuff because it's giving max recursion errors
added locations
Merge branch 'develop' into feature/39-users-location

Conflicts:
	mentorup/users/models.py
add an other location for those who don't live in these cities
Merge branch 'feature/39-users-location' into develop
hook up the contact link from postman to the user detail and user listing pages
don't require user to login to look at a user's profile
add an about page
add some fontawesome goodness
better flow when the user is first signing up
change the name of the site from example.com
nicer formatting on the signup page
move the locations out of the class
use tabs instead of buttons for navigation
Merge branch 'feature/43-user-profile-page' into develop
Merge branch 'develop' of github.com:briandant/mentor_up into develop
fix the update view so the data gets saved
add an install.rst with instructions for how to get mentorup running on your local development machine