Merge branch 'hotfix/optimize' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop

* master:
  Update README.md
Make _config.yml more generic
Merge branch 'hotfix/updates'
Merge branch 'hotfix/updates' into develop
Flickr link
Optional Analytics
Improving readability for users without CSS: adding a space between title and date.
Merge pull request #11 from diegocaro/master

Minor changes
Merge branch 'master' into develop

# By Diego Caro
# Via Michael Rose (2) and Diego Caro (1)
* master:
  Improving readability for users without CSS: adding a space between title and date.
  Optional Analytics
  Flickr link
Fix optional Google Analytics.
Optional Twitter cards meta
Fix endif typo
Merge branch 'hotfix/minor'
Merge branch 'hotfix/minor' into develop
Add 'vendor' to excludes.
Merge pull request #12 from tylerrhodes/master

Add 'vendor' to excludes.
Undo merged pull request 15d6754befed53ee28b878d83c113731a1f6af9c

Excluding vendor folder causes issues with JavaScript that the theme needs to load.
Merge branch 'master' into develop

# By Michael Rose (1) and Tyler Rhodes (1)
* master:
  Undo merged pull request 15d6754befed53ee28b878d83c113731a1f6af9c
  Add 'vendor' to excludes.