org-mode and others
added -1 option to cscope-indexer and conf
mrxvt profile
added USB stick utilities
not sure
added egg .
Merge branch 'cipi'

Conflicts:
	apps/emacs/emacs-keys.el
Merge branch 'master' of caprica:femto/env

Conflicts:
	apps/emacs/emacs-general.el
	apps/emacs/emacs-keys.el
multifile ec
small correction in README.txt
space before current dir for easy copy/paste
Merge branch 'master' of caprica:femto/env

Conflicts:
	.emacs
relocate org to udir/tools
Merge branch 'master' of caprica:femto/env
align on picon
.xmodmaprc
add wrangler back
rmem utils
merge with dLuna config
add zsh config from dLuna