add proxy settings
edit https export
Merge branch 'master' of github.com:wknar/dotfiles into DO_NOT_PUSH_RMAC
remove pftp
added alias for tab transfer
Merge branch 'DO_NOT_PUSH_RMAC'

Conflicts:
	.bashrc