Update type names for Jekyll 2.3
Update Gemfile.lock
Add and use an empty layout to fix Jekyll warnings
Update Gemfile.lock with "bundle update"
Merge branch 'development'