sets project-wide preference tabwidth=2 expandtabs

This makes it easier for new code to automatically match the indentation
style in use across the project.

[#76]
omits relationship from user desc when none exists

[#76]
replaces ?: with if-else cascade

Thanks @parkr for readability-checking this!

[#76]
Merge pull request #77 from jeremy-w/omits-user-relationship-when-none-76

Omits user relationship when none
Merge branch 'master' into develop

Conflicts:
	wry/ADNUser.m