Include emacs22 in the Travis build again

Should work now rolandwalker/emacs-travis#3