Add "up" alias to gitconfig

Fail the update if fast-forward merges aren't possible, plus some other goodies as described here: http://stackoverflow.com/a/15316602