Minor edits for Ubuntu 14.04 compatibility.
Merge pull request #14 from jstewart/stevefixes

Minor edits for Ubuntu 14.04 compatibility.