Develop

travis is finally building properly. yay.
this fixes #1