Cleaned up models and specs, added specs for users controller and started cleaning up company stuff