Removed unnecessary migration files
Users update
Plus some comments
Merge branch 'github/master'
Merge branch 'master'

Conflicts:
	app/views/users/edit.html.erb
Merge branch 'github/master'
Merge branch 'master'

Conflicts:
	app/models/user.rb
	app/views/users/edit.html.erb
Getting user editing working
Admin edit now working
Update user actions
Add user controls
Merge branch 'github/master'
Merge branch 'chris'

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/users/user_page.html.erb
	config/routes.rb
	test/functional/users_controller_test.rb
Style updates
Small updates