Merge current development changes

This is mainly being done to try out Travis CI.