Fix indentation
Merge pull request #529 from gringocl/fix-indentation

Fix indentation
Change source repository
Add tmux aliases and disable screen-like bindings
Alias adjustments for OS X