add pandoc and dash
Merge branch 'gh-pages'

Conflicts:
	Brewfile
Merge branch 'master' of ssh://github.com/joe-re/dotfiles