Optimized uses.
Removed user specific files.
Goddamn executable bits.
Removed duplication.
Fixes suggested by Fabien.
Some of Fabien's "fixes" "break".
Merge pull request #239 from xi-project/fabien-fixes-pt2

Fabien fixes pt2