Merge branch 'master' of github.com:oleiade/etcaetera
Initial commit
Update gitignore to untrack virtualenv files