update gems + do not update a site unless the force option is present
bump version to 1.3.3
the permalink of snippets now behave like the one from pages (locomotivecms/wagon#140 and locomotivecms/wagon#141)
bump version to 1.4.0 + new versions of compass and sass
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into i18n_fix