this is an ugly commit of a broken app state so that I may edit on a remote machine
ugly commit to get users angularjs controller working, still broken state
Fixed requests so that most user requests work.
Merge branch 'master' into directoryFeature

Conflicts:
	app/assets/javascripts/profile.js
	app/assets/javascripts/vicini.js
	app/controllers/profiles_controller.rb
	app/models/user.rb
	app/views/addresses/_form.html.haml
	app/views/layouts/application.html.haml
Fix typo.
Remove Livereload.
Merge pull request #12 from unsay/directoryFeature

Directory feature