Set empty riverid when one is not supplied for new users.
Tidy up.
Merge branch 'riverid-bug' of git://github.com/solarissmoke/Ushahidi_Web into develop

Conflicts:
	application/models/user.php