Fixed upgrade guide link and license date
Prepare for release
Merge branch 'release/2.2.1' into 2.2/master
Added Travis build status image
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop
fix for #2117
Merge branch '2.2/develop' into feature/comment-emails