adding setting to show travis-ci
explicit line endings for sh files
newline
Merge pull request #17 from organman91/master

Explicitly have sh files use UNIX line endings
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.
Very basic website.
Updating website
mocking in some of the ansible api that I believe is going to be needed for the project.
Merge pull request #18 from mpdavis/mock_ansible_api

mocking in some of the ansible api that I believe is going to be needed ...
adding docs
Merge branch 'master' of github.com:mpdavis/vinz
adding dev environment stuff to docs
api docs
adding Michael's basic stuff to the team page