Making progress
Merge branch 'master' of github.com:RyanThompson/Users

Conflicts:
	field.users.php
	views/fragments/users.js.php
Merging from conflicts being poopy