added an error description, which appears to be common on ubuntu 14.04
Merge branch 'master' of github.com:csabiftw/atom