Merge pull request #28 from olab-io/gsoc

Continuous Integration
Merge pull request #22 from brannondorsey/develop

Merge pull request #28 from olab-io/gsoc