fixes for profile
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/users_controller.rb
Profile, Password, SSH Keys
Merge pull request #113 from indykish/0.5

0.5 fixes for sshkeys, profile and delete v1 api.