Clean up leftover git merge crud
Add initargs for follows
Somehow, follows.lisp slipped through the cracks in the merge

Conflicts:
	classes/follow.lisp
How did all these files not get merged?
More missing files.

Conflicts:
	views/api/user.lisp