Add prompts, some teamocil, aliases
symlink prompts
Merge remote-tracking branch 'origin/master'