Merge branch 'split-maps' of github.com:drio/site into drio-split-maps
Merge branch 'split-maps' of github.com:drio/site into drio-split-maps
Merge branch 'split-maps' of github.com:drio/site into drio-split-maps
Merge branch 'split-maps' of github.com:drio/site into drio-split-maps
Merge branch 'split-maps' of github.com:drio/site into drio-split-maps
Merge branch 'split-maps' of github.com:drio/site into drio-split-maps
Merge branch 'split-maps' of github.com:drio/site into drio-split-maps
More work on map display
Blog post on feedback on 2013-12-03-edinburgh
Wrapped lines
Martin Jones' second book
Merge pull request #228 from mikej888/2013-12-03-edinburgh-blog

Blog post on feedback on 2013-12-03-edinburgh
Merge pull request #229 from gvwilson/blog-jones-book

Martin Jones' second book
Last few badges of 2013
Blog post about new instructors
Merge branch 'master' of https://github.com/swcarpentry/site into split-maps
Merge branch 'split-maps' of https://github.com/gvwilson/site into split-maps