DS data, outline
Merge branch 'master' of github.com:rsmeral/devconf2014
Merge, whitespace