Merge branch 'py2-ci' into 'master'

Add Support for Python 2 w/t CI Improvements

Closes #35 and #36

See merge request !9