Updated key bindings
Update
Updated power function to work on mac
Updated tmux aliases
Updated tmux configuration
Updated directories to correspond to new projects
Updated tmux
Updated directory helpers etc
Updated various methods
Updated javascript / find utilities
Initial mac branch commit
Updated directory aliases
Updated tmux to have vim navigation bindings.
Temp commit
Revert "Temp commit"

This reverts commit 3bcddeb6c398c5dc27aeb560eea35ad32f1fce72.
Updated reload to help with shell_config for individual directories
Built out git merge helper
Updated git.merge function
Added binding to clear scrollback history in tmux
Changed tmux history shortcut