Merged eile's pull request. Merged tribal-tec's pull request by removing all X11-dependent code. Please contact me if there are still issues building on Ubuntu 13.04