add ftp tools
Merge branch 'master' of github.com:azet/dotfiles

Conflicts:
	.bootstrap
add pandoc