closes #119
Merge branch 'master' of github.com:nprapps/oscars