Use travis_wait to try to increase timeout for Travis-CI tests.
Initial work toward consistent exception handling.
Merge pull request #15 from jmchilton/exception_handling

Initial work toward consistent exception handling.