Entry spec refactor
Put association first on Entry model
Small tweak to User model