More testing
Refactoring
Removing testify install from travis file, since it will be installed through the get-deps call
Updating Makefile
Updating Makefile and travis file
More refactoring = shorter import path / more go get-able
More refactoring = shorter import path / more go get-able 2
More refactoring = shorter import path / more go get-able 3
This should improve testing speed
Fixed indentation in travis file
Merge branch 'develop'