Merge cleanup

Starting to prune off unnecessary code. 

Any routes specific to a specific user go through api/user through the User Model. 

Any routes specific to a kiwi go through api/kiwi through the Kiwi Model. 

Any routes specific to a group go through api/group through the Group Model.