various profile upddates
Merge branch 'images'

Conflicts:
	instagain.rb
	lib/user.rb
ignore