Place photos in post-specific folders for organisation
Add split-image CSS
Fix split-photo margins
Merge remote-tracking branch 'upstream/master'

Conflicts:
	_posts/2014-08-12-the-travelog-theme.markdown