Remove unncessary controllers, add needs and merchandise controllers, and add organizations and people controllers
Add pre-push commit