Fix #32. Add ability to merge User accounts.

Added user.real_id to link to the real_user (the account into which this
user is being merged).
Renamed and restructured functions in ApplicationController. Now have:
* current_user
* original_user
* sudo_user
And now use these helper_functions instead of accessing the global
variable directly.