Merge pull request #427 from apenney/fix-1404-tests

Fix Ubuntu 14.04 tests for now.