MIL-47: Clear remaining issues with iTunes feed by ensuring: all GUIDs are unique, the self-links are correct for milacron.crossroads.net, only valid HTTP or HTTPS source URLs are used, duration must be of format 0:00 if not available
Merge branch 'master' of github.com:crdschurch/crossroads.net

# By Chris Tallent (8) and IngageMaddoxT (7)
# Via IngageMaddoxT (6) and Chris Tallent (1)
* 'master' of github.com:crdschurch/crossroads.net:
  fixed layout wrapping
  Remove sample Audio and Video media
  MIL-48: Use image src url specific to media collection
  removed permalinks for media-series updated samples md files to remove permalinks
  moved includes to folders for media series, changed startdate to date made corresponding changes to jekyll template
  ignore make.less
  refactored media page and assoc includes
  Added music and video to media page trying to create include to generate list for series, music, video. seems to be a problem with reversed and limit combined. still researching
  MIL-48: Add layouts for media and music; Add collections for media and music; Add sample media and music markdown files
  MIL-48: Use series description next to image in layout
  MIL-48: Add series entry for Heavyweights 2
  Changed permalink of media mockup page to media-mockup Added stub for new media page, permalink /media/ changed config.yml to add _pages directory to build
  MIL-48: Temporarily use Jekyll from git/master in order to pick up collection sorting fix; Sort the series using Jekyll built in filters
  MIL-48: Add jekyll plugin to sort collections in Liquid templates from Github Gist https://gist.github.com/mbland/3812259
  MIL-48: Adding a series How to Change the World and changing the series.html layout to only include related messages