Merge branch 'gh-pages' into patch-1

Author: mlinksva

.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.3

.travis.yml

@@ -7,20 +7,9 @@ env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
 
-addons:
-  apt:
-    packages:
-    - libcurl4-openssl-dev # required to avoid SSL errors
-
 branches:
   only:
     - gh-pages
     - /.*/
 
-before_install:
-- openssl version
-- openssl ciphers -v
-- openssl s_client -cipher ECDHE-RSA-AES256-GCM-SHA384 -connect github.blog:443 -tls1_2
-- curl -sSL -D - https://github.blog/2014-02-14-rendered-prose-diffs/ -o /dev/null
-sudo: false
 cache: bundler

Gemfile

@@ -2,10 +2,13 @@
 
 source 'https://rubygems.org'
 
-gem 'github-pages'
-gem 'jekyll-octicons'
-# need lazy-load support
-gem 'jekyll-avatar', '>= 0.6.0'
+gem 'github-pages', '> 103', group: :jekyll_plugins
+
+group :jekyll_plugins do
+  gem 'jekyll-octicons'
+  # need lazy-load support
+  gem 'jekyll-avatar'
+end
 
 group :development, :test do
   gem 'html-proofer'

_data/governments.yml

@@ -104,13 +104,15 @@ Canada:
   - AAFC-MBB
   - abgov
   - bcdevexchange
+  - bac-lac
   - BCGov
   - canada-ca
   - cds-snc
   - CIHR
   - cityofgreatersudbury
   - cityofottawa
   - cityofsurrey
+  - CityOfSarnia
   - CityofToronto
   - CityofEdmonton
   - cityssm
@@ -368,6 +370,7 @@ Norway:
   - nasjonalmuseet
   - navikt
   - nlbdev
+  - Riksrevisjonen
   - Rogaland
   - rutebanken
   - ruterno
@@ -718,7 +721,6 @@ U.S. Federal:
   - globegit
   - gopleader
   - government-services
-  - GreatSmokyMountainsNationalPark
   - gsa
   - gsa-oes
   - hhs