Changes to support Ubuntu 14.04

@shanesveller