adding setting to show travis-ci
Merge branch 'master' of github.com:mpdavis/vinz

# By Max Peterson (3) and Zach Heilman (2)
# Via Max Peterson (1) and others
* 'master' of github.com:mpdavis/vinz:
  newline
  explicit line endings for sh files
  Fix import error
  Adding UserGroup
  Added more db collections definitions, defining the schema further.