Upgrade to Jekyll 2.2.0; move theme config to _data folder, closes #5
Fix merge