updates submodules, adds fasd
various incl. bash prompt
merge