Edit profile page [#11]
Autoload user.rb [#31]
Merge pull request #32 from AndrewLorente/autoload_user

Autoload user.rb [#31]
Public profile page [#11]
Update docs on how it interacts w/ Janrain [#11]
Fix some prose [#11]
Defensive programming in User#fetch_from_uuid [#11]
Fix error message for new concept form
Remove Turbolinks [#26]

Based on what I've read, the ecosystem just isn't in a place right now
where you can make turbolinks work with 3rd-party JS like the Janrain
Capture Widget.
Merge pull request #34 from AndrewLorente/turbolinks-support

Remove Turbolinks
Merge pull request #33 from AndrewLorente/profile-edit

Profile edit and public profile pages
Add multiple concept descriptions and ability to delete concept descriptions
Merge remote-tracking branch 'upstream/master' into concepts

Conflicts:
	Gemfile.lock
	config/routes.rb
	lib/user.rb
Add user to concept description