Some git ignore-fu
Make rebase default for git pull
Tweaks to teamocil layout