Merge branch 'master' of github.com:maptime/maptime.github.io into st…

…art-edits

.travis.yml

@@ -0,0 +1,17 @@
+sudo: false
+language: ruby
+cache: bundler
+before_install:
+ - npm install -g geojsonhint
+branches:
+  only:
+    - master
+rvm:
+  - 2.1
+script:
+  - bundle exec jekyll build
+  - bundle exec htmlproof ./_site --only-4xx --check-favicon --check-html --empty-alt-ignore --ignore-script-embeds
+  - result=$(geojsonhint --json < _data/chapters.json); echo "$result"; ! grep -qF '"error":' <<< "$result"
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer 

Gemfile

@@ -1,2 +1,6 @@
 source 'https://rubygems.org'
-gem 'github-pages'
+gem 'github-pages'
+gem 'jekyll-feed'
+gem 'html-proofer', github: 'gjtorikian/html-proofer', :ref => 'cfdaad62e2'
+gem 'geojsonlint'
+gem 'httparty'

Gemfile.lock

@@ -1,14 +1,33 @@
+GIT
+  remote: git://github.com/gjtorikian/html-proofer.git
+  revision: cfdaad62e2c75a8a610fe7de56c4e1694cf7523c
+  ref: cfdaad62e2
+  specs:
+    html-proofer (2.5.1)
+      addressable (~> 2.3)
+      colored (~> 1.2)
+      mercenary (~> 0.3.2)
+      nokogiri (~> 1.5)
+      parallel (~> 1.3)
+      typhoeus (~> 0.7)
+      yell (~> 2.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
     activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
+    addressable (2.3.8)
     blankslate (2.1.2.4)
+    builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     classifier-reborn (2.0.1)
@@ -18,10 +37,16 @@ GEM
       execjs
     coffee-script-source (1.8.0)
     colorator (0.1)
+    colored (1.2)
+    ethon (0.8.0)
+      ffi (>= 1.3.0)
     execjs (2.2.1)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     gemoji (2.1.0)
+    geojsonlint (0.1.3)
+      activemodel (>= 3.0.0)
+      json-schema (~> 2.5.0)
     github-pages (27)
       RedCloth (= 4.2.9)
       jekyll (= 2.3.0)
@@ -41,6 +66,9 @@ GEM
     html-pipeline (1.9.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
+    httparty (0.13.5)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
     i18n (0.6.11)
     jekyll (2.3.0)
       classifier-reborn (~> 2.0)
@@ -59,6 +87,7 @@ GEM
       toml (~> 0.1.0)
     jekyll-coffeescript (1.0.0)
       coffee-script (~> 2.2)
+    jekyll-feed (0.3.1)
     jekyll-gist (1.1.0)
     jekyll-mentions (0.1.3)
       html-pipeline (~> 1.9.0)
@@ -76,6 +105,8 @@ GEM
       html-pipeline (~> 1.9)
       jekyll (~> 2.0)
     json (1.8.1)
+    json-schema (2.5.1)
+      addressable (~> 2.3.7)
     kramdown (1.3.1)
     liquid (2.6.1)
     listen (2.7.9)
@@ -86,8 +117,10 @@ GEM
     mercenary (0.3.4)
     mini_portile (0.6.0)
     minitest (5.4.1)
+    multi_xml (0.5.5)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
+    parallel (1.6.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.9)
@@ -106,12 +139,22 @@ GEM
       hitimes
     toml (0.1.1)
       parslet (~> 1.5.0)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yajl-ruby (1.1.0)
+    yell (2.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  geojsonlint
   github-pages
+  html-proofer!
+  httparty
+  jekyll-feed
+
+BUNDLED WITH
+   1.10.6

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/maptime/maptime.github.io.svg?branch=master)](https://travis-ci.org/maptime/maptime.github.io)
+
 maptime.github.io
 =================
 

_config.yml

@@ -7,6 +7,10 @@ github_org: maptime
 maptime:
   chapter: Maptime HQ
   twitter: maptimehq
-  #disqus: YOUR DISQUS USERNAME
+  #disqus: YOUR DISQUS USERNAME 
 
 excerpt_separator: <!--more-->
+exclude: [vendor]
+
+gems:
+  - jekyll-feed