users can now edit their profiles. Still work in progress.
Merge branch 'listings' into development

Conflicts:
	.gitignore
	lib/air_cycle/db/in_memory.rb
	web/.gitignore
	web/app/controllers/air_cycle_controller.rb
	web/app/controllers/users_controller.rb
	web/app/views/users/edit.html.erb