Add support for Ubuntu 13.10 and 14.04
Merge pull request #87 from ryandub/test_fixes

Add support for Ubuntu 13.10 and 14.04