Add bundle for easier testing
update has_many and scope conditions syntax
- prevents rails 4 deprecation warnings -> instead of :conditions, or lambda