Moved a data-barley off a P tag in the sidebar.
Merge branch 'master' into alternateposts
Merged in changes from master and updated photos and photos-single for the sidebar change.