Content changes for 20141029
Merge branch 'content' of https://github.com/vesterheim/vesterheim.github.io into content
Optimize the order of styles and scripts
Merge branch 'content' into develop
Move around head elements
Moved various directories to assets directory
Add some events to the calendar. Modify some existing events. Play around with frontmatter. Still needs standardization.
Quick dumb hack to try to limit items on home page
Merge branch 'develop' into content
Add norway-tours--guides collection to _config.yml
Add guides to norway-tour--guides collection
Add include for styling guidelisting
Replace hard coded tour guide info with includes styled by guide.html include with data pulled from the collection.
Fix some bugs in the image--lead.html include to work better for the tour guide listing include.
Add stylesheet and svg logo for Wufoo theme
Merge branch 'content' into develop
Becky's updates
Merge branch 'content' of github.com:vesterheim/vesterheim.github.io into content
Merge branch 'content' into develop
Merge remote-tracking branch 'upstream/develop' into develop