Squashed commit of the following:

commit 9b779a9a6bccb68118b828e5d6d76fc78d1b42fe
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri May 23 13:06:13 2014 -0500

    Added completion.local directory

    Added _kitchen completion code from https://gist.github.com/petere/10307599
    Updated completion.zsh to add path to completion.local directory to $FPATH

commit 79ab387eacc5064708f203327d1f206931830ca6
Merge: 875335b eddcbd2
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu May 22 16:03:55 2014 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

commit 875335b5fddad73354e32107a5a00a5d1b8bc1da
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu May 22 16:03:51 2014 -0500

    now with 100% more knife status aliases

commit eddcbd2fb5438d998f28cd3d8d775a45bf81d826
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed May 21 15:29:06 2014 -0500

    Updated README

    Noted that my OS of choice is OS X and that my configurations are tuned for that platform.

commit 031c5ee3e36d91f532433c0a4ccae09956eb0fe6
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat May 17 23:20:06 2014 -0500

    cleaned up badwolf color scheme URL for Vundle

commit af780c20b113a738bdc1abe5757be3e47a0f4a44
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon May 12 23:05:19 2014 -0500

    Added functions to make better use of Dash.

    dash: to look up anything
    dman: to pull up the man page for something

commit 5f18f869d5744ced36228ea8854c189f69474e10
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri May 9 08:27:22 2014 -0500

    Added `gemrc` to dotfiles.

    By having a `gemrc` file it is possible to prevent `gem install` and `gem update`
    from downloading RDoc and RI.

commit d3f29472950e733c9a6a35692bcea25efb93ceab
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu May 8 09:20:47 2014 -0500

    added knife aliases for tagged and not tagged nodes

commit d3b632dc30a484e5f6c5fad1756b461d41f1deb6
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu May 8 09:20:30 2014 -0500

    updated entry for tools in ssh config. using proper name now

commit fcd7aefea353117a7699cf24e6b972c6929ac512
Merge: 31c6e79 eff0b80
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed May 7 13:02:32 2014 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

commit 31c6e79f27d59ba6a1eb2a5f9609d12c374f8015
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed May 7 13:02:25 2014 -0500

    set vim colorscheme to badwolf

commit eff0b80319c9e259f8280accc6dcac426074f44c
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Apr 23 22:24:21 2014 -0500

    added new disk usage alias

commit 3480cde543d12b7c5e6bb3264067020cc39f0e2c
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Apr 12 22:54:01 2014 -0500

    changed alias to lsd as ld is a linker. oops

commit 31a93dfb3a5a4571a42757e3446df8f366a20f6c
Merge: 9eeb0b8 1f94ab0
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Apr 12 22:52:26 2014 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      updating ST2 stuff

commit 9eeb0b8e429403f14dd8311b7e36e26c105cd827
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Apr 12 22:52:14 2014 -0500

    added list directories alias

commit 1f94ab0b685ba1d14c3b007a4a7354cefe5c0ba9
Merge: 93c5335 6230814
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Apr 11 22:09:47 2014 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

commit 93c5335fb441515037790bac3913fdefb65089ef
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Apr 11 22:09:43 2014 -0500

    updating ST2 stuff

commit 62308147e22d1f0f9f723bb417eb14fd930e0c6d
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Apr 11 22:05:27 2014 -0500

    Modified zsh environment to add indicator for Vi-mode on command line.

    Reduced lag when switching modes to 0.1 second
    Setup function to add indicator for Normal mode on command line
    Added code to show system Ruby version when neither rbenv or RVM are present.

commit 1ed96fa71ef9b8bc4f75d87a2c0a2b072ab9dde8
Merge: e96a824 2f8afec
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Apr 6 21:54:09 2014 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      changed os x editor to be vim
      added new hosts to ssh config

commit e96a8244cabfa3d3400d34a8b12cdc4b3dfc327d
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Apr 6 21:53:59 2014 -0500

    turned on airline buffer display, removed minbuffer

commit 2f8afec3536d32e94731e263da2f858144e72c7d
Merge: cf39d45 da8d491
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Apr 1 15:53:24 2014 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

commit cf39d45daff8ad0074f1fcf40e3ba55086bd3f6f
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Apr 1 15:53:07 2014 -0500

    changed os x editor to be vim

commit 3079774c8d37521bdd611e1f05c9ced00a68e9c1
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Apr 1 15:50:33 2014 -0500

    added new hosts to ssh config

commit da8d49154401405edf7b8fbd6b06180df490280e
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Mar 31 10:25:57 2014 -0500

    Updated ssh config to add xendor to list.

commit 8d2bbb12c0faa355ca89f4a8d4517662e5a830b0
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Mar 31 09:30:34 2014 -0500

    added encryption setting to vimrc

commit 5c022f91ca81930d51dd82bdb0d2bb40f54ee01a
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Mar 31 09:30:16 2014 -0500

    added makepass alias that uses openssl rand function

commit 1cbd1faa7bbbd52e0b6a07a68e897d7c575fdf7d
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Mar 19 21:17:17 2014 -0500

    Added new mapping for better pasting from clipboard in vim.

    One command that combines the paste mode setting and lines up indents for
    pasting from the clipboard. Cool.

commit 0415ba2d5f18b5eba968af055d0d9a24aadb392a
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Mar 19 21:09:07 2014 -0500

    ST2 strikes again

commit cc13131042fc835022d548571262ff630fea37ec
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Mar 18 08:10:57 2014 -0500

    Added mapping for when I forget to sudo a protected file on edit.

    Also cleaned up a few comments.

commit 53e9edac6f37a0cd32dbb73fde3c0664d41e5c65
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Mar 15 22:19:57 2014 -0500

    Added configuration for `doing`.

    Created new directory and configuration file for `doing` gem.
    Updated README to explain how to set it up.

commit 0fc13c13fb3f709a19149509c66cd70f9fc6e124
Merge: 69b1a06 0dcbbe6
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Mar 15 22:14:03 2014 -0500

    resolved yet another ST2 last run conflict

commit 69b1a06d31811cd14d6e7e5559b2ab928b0169b1
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Mar 15 22:13:01 2014 -0500

    added functions for displaying nodes via knife

commit 0dcbbe605880ce3494b71dbfe479e01304b4b51e
Merge: be3523c d0cde39
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 14 15:43:18 2014 -0500

    Merge pull request #6 from zanshin/test2

    removed line from README

commit d0cde395e680b285d273eace38fc312fb4654acc
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 14 15:41:10 2014 -0500

    removed line from README

commit be3523cd92820127c2df7898b2c333782e09e31a
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 14 15:36:37 2014 -0500

    Added new line to Readme

    We need more infor

    ;x

commit 9c94de5e6ed5900ed729c319ffb04176030935b2
Merge: d416b0e 4e4f0b5
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Mar 12 14:15:37 2014 -0500

    resolved merge conflict

commit d416b0e057f3aebffd1312599be4798101450f95
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Mar 12 14:14:08 2014 -0500

    updated ssh config to remove port forwarding. ST2 updates

commit 0af892fa3f618bcc75a5e8c684b4f84e3740d3b0
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Mar 12 14:13:26 2014 -0500

    added console capture command to tmux.conf

commit 4e4f0b51d49d061a861d25da2ae73390156c7dba
Merge: 15bd72e 68c0f8e
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Mar 11 10:55:57 2014 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles: (24 commits)
      removed no longer needed ssh config
      added tmux kill-session alias
      ST2 sure is noisy.
      added please alias for sudo !!
      new tmux aliases
      adding bash functions
      Revert to eb1aaf6
      added tmux alias, updated ST2
      Added vim-snipmate and vim-snippets.
      Pesky ST2 last-run.
      Commented out Chef context bit from prompt.
      ST2 last run
      Added code to show current Chef repo context in prompt.
      Added wifi alias from http://brettterpstra.com/2014/02/15/quick-tip-automating-you-macs-wifi-power/
      some directory shortcuts
      Added Chef plug-in to ST2.
      Added Control-P bundle.
      Altered settings for zsh auto-correct.
      cleaned up vimrc
      Changed test for rbenv.
      ...

commit 15bd72e801fd566817c2ae8818573fa7abc98939
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Mar 11 10:55:42 2014 -0500

    changed executable directory color to be readable

commit 68c0f8e96f0540fc0ee2cdd9769b201bc94f0c57
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Mar 10 23:21:24 2014 -0500

    removed no longer needed ssh config

commit df4543595f9b87fb32dabb082a6bf11e5233509e
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Mar 9 21:40:37 2014 -0500

    added tmux kill-session alias

commit ea6529daecc314ced9dbf50e346a5055acaddfb9
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Mar 8 20:20:33 2014 -0600

    ST2 sure is noisy.

commit 63ff6dbfa840f3f6bbd2b641bc844c60e91a8c7e
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 7 13:29:25 2014 -0600

    added please alias for sudo !!

commit 0627190a6a78cb746f7a2f93f32b32f32c6655cd
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 7 09:00:04 2014 -0600

    new tmux aliases

commit 2643663403ae026d1e8fe0b6ecaa0dd975c5a827
Merge: 597be59 9890238
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 7 08:57:57 2014 -0600

    Merge branch 'master' of github.com:zanshin/dotfiles

commit 597be59fb7f4b9b455b3f3a6c8a0f32985377ae9
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 7 08:57:04 2014 -0600

    adding bash functions

commit a80165e7da3ac6c669dbca6bcac12b4b3a8139d3
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 7 08:55:51 2014 -0600

    Revert to eb1aaf6

commit 51e6833f1a40b10c78b6726813823918b05e284f
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Mar 7 08:42:43 2014 -0600

    added tmux alias, updated ST2

commit 98902387588e5d81853e8e814dc6b72e84e8bc56
Merge: bbdde87 5911b5a
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Mar 1 13:40:20 2014 -0600

    Merge pull request #5 from zanshin/vim-snippets

    Vim snippets

commit 5911b5a533d8e40d53d1b4f399ba848e00756676
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Mar 1 13:38:13 2014 -0600

    Added vim-snipmate and vim-snippets.

    Added snippet ability to Vim. Primary reason was to get Ruby and Chef snippets.
    Had to fiddle file type setting for Ruby and eRuby files to add chef to string.

commit 26c7dbed2eda9f0822b9a37dd7649d4c11000864
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Mar 1 12:31:09 2014 -0600

    Pesky ST2 last-run.

commit bbdde873c5a3b036d71ff28e37faac225d7f8d70
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Feb 25 10:24:26 2014 -0600

    Commented out Chef context bit from prompt.

    It's nice an all, but since I'm displaying the full path having part of the
    path repeated as a context reminder seems a bit of overkill. Left code there
    just in case.

commit 39c0a82988809e4dac9737733a8fa42f068565fd
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Feb 25 09:46:07 2014 -0600

    ST2 last run

commit 44ddca63daece860ef97e202a808926c95c7d03f
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Feb 19 11:36:25 2014 -0600

    Commented out git aliases.

    Turns out `gc` is a command to show garbage collection on JBoss servers, so having an `gc` Git alias is a problem. Rarely use Git on OME servers, so commenting out all Git aliases for now.

commit 569a493c856a7e67e396c2b0a1f96124d85b9a74
Merge: 0d0d575 847b4f0
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Feb 18 17:22:21 2014 -0600

    Merge pull request #4 from zanshin/chef-prompt

    Chef prompt

commit 847b4f0417e1fe0e71678da6478c4c01897ee0bc
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Feb 18 17:20:26 2014 -0600

    Added code to show current Chef repo context in prompt.

    Mmm. Tasty.

commit 0d0d57542153c7d2e6283853a2df6715dc6f4c31
Merge: 5ecac4b 3056060
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Feb 17 22:32:06 2014 -0600

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      Added Chef plug-in to ST2.
      Added Control-P bundle.
      Altered settings for zsh auto-correct.
      cleaned up vimrc

commit 5ecac4b3d8be0015e61266fedbb22e2119bdf759
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Feb 17 22:31:17 2014 -0600

    Added wifi alias from
    http://brettterpstra.com/2014/02/15/quick-tip-automating-you-macs-wifi-power/

commit be5d87f3b0338d6dfc508c9ef4ba9b5a5ee99a3c
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Feb 14 14:44:16 2014 -0600

    some directory shortcuts

commit 305606022bc585afd0703dc68739f979d66fc3d9
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Feb 12 21:53:21 2014 -0600

    Added Chef plug-in to ST2.

    First run of ST2 in a long while, several updates happened.

commit b4fff31d377d383f89b594f883edc848c46fe194
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Feb 12 21:52:28 2014 -0600

    Added Control-P bundle.

    Added fuzzy search bundle Control-P.

commit 97d5bc7b2a5ea908e3d492efac583fea25244048
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Feb 12 21:50:53 2014 -0600

    Altered settings for zsh auto-correct.

    By un-setting correct_all command arguments will no longer be "corrected".
    Leaving correct set to catch misspelled commands.

commit 7717fdf6911d412d9393cc7f803a557ca51de376
Merge: 48244ee 34d3959
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Feb 8 21:57:16 2014 -0600

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      Changed test for rbenv.
      Added test for words to avoid in technical writing.

commit 48244eedfbfc630c7dbe4f6d95f5df9408c70888
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Feb 8 21:57:02 2014 -0600

    cleaned up vimrc

commit 34d39591388e0a29b47320633459b856f290028e
Merge: 0fedfb2 f956099
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Jan 26 23:28:56 2014 -0600

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles: (31 commits)
      Added nocorrect alias for sudo.
      better history searching via partial term and arrow keys.
      Added autocmd to stop Vim from auto-inserting comments
      Cleaned up aliases and functions.
      Added code to properly setup TERM based on OS type
      corrected path statement
      changed CVSROOT to be straight alias
      Updated bashrc with code from eisele bashrc.
      Added functions from mbaxa and path function.
      Added SunOS specific aliases.
      Eliminated bashrc_<OS> files.
      Added ome-web[234] to .ssh config.
      added some knife aliases
      Completed addition of LocalForward to ssh config.
      Added attach alias.
      Added Port forwarding to ssh config.
      Finally updated README to reflect account name change.
      Made vimrc gracefully degrade for servers with older vim versions.
      Refactored bashrc for multiple operating systems.
      Changed push.default from `simple` to `matching`.
      ...

commit 0fedfb2818065d574e04381526c6d882d9c94824
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Jan 26 23:28:15 2014 -0600

    Changed test for rbenv.

    Change test for presence of rbenv. Old test wasn't working.

commit 30068116047f2225f6c71b1396481a6fa6a431f1
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Jan 26 23:27:28 2014 -0600

    Added test for words to avoid in technical writing.

    Nifty idea to highlight words one should avoid in technical writing.

commit f956099e152ec17dc910f26553bef73b6df92df5
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Jan 25 09:21:38 2014 -0600

    Added nocorrect alias for sudo.

    Nocorrect aliases prevent zsh's normally useful auto-correct feature from
    trying to correct things it shouldn't. Adding an alias for sudo prevents it
    from matching commands with similarly named dot files.

commit 251905c8383191178a5a544de914304d36d24428
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Jan 19 17:41:41 2014 -0600

    better history searching via partial term and arrow keys.

commit 804f96b4a368b2d689084eb5d9e3948e125c147b
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jan 17 18:42:03 2014 -0600

    Added autocmd to stop Vim from auto-inserting comments

    Basically this: http://tilvim.com/2013/12/30/remove-comment-prefix-2.html

commit 5c0cf4902a6dae3c9d37fdef067909f65668f33a
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Jan 15 08:59:42 2014 -0600

    Cleaned up aliases and functions.

    Removed unalias from functions and renamed overridden functions to start with `my`
    Removed SunOS specific setting for ggreo as it wasn't working properly

commit e9a2a611b96db377e44330613ccfcf920dcb1b97
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Jan 15 08:53:51 2014 -0600

    Added code to properly setup TERM based on OS type

commit bf737b263891b052c2029b8f093ebbb23cc84cc1
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Jan 14 22:53:49 2014 -0600

    corrected path statement

commit 6f6f193f28d004dca3c504855d21ea210c514d6e
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Jan 14 14:58:59 2014 -0600

    changed CVSROOT to be straight alias

commit 9e71f3bdab8c7e0f6623ee240e33991c1efe8625
Merge: c8127f6 eb1aaf6
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Jan 14 14:56:42 2014 -0600

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      Added ome-web[234] to .ssh config.
      added some knife aliases
      Completed addition of LocalForward to ssh config.
      Added attach alias.
      Added Port forwarding to ssh config.
      Finally updated README to reflect account name change.

commit c8127f678bfae16c6eb46f76a46f9c4b41774c97
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Jan 14 14:55:04 2014 -0600

    Updated bashrc with code from eisele bashrc.

    SunOS specific settings and otehr goodies necessary for ease-of-use on various servers.

commit 437947a57a9913c0690fca0f53703021866f4c6c
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Jan 14 14:54:35 2014 -0600

    Added functions from mbaxa and path function.

commit b62b9f00c3bee2c336a59f48c76f298de1db559a
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Jan 14 14:54:10 2014 -0600

    Added SunOS specific aliases.

commit 7996f7ac806f8a5247ba8c450e61ef1f996e9587
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Jan 14 14:52:08 2014 -0600

    Eliminated bashrc_<OS> files.

    Collapsed all bashrc settings into one bashrc file. Having OS specific was a good thought but more trouble than it was worth.

commit eb1aaf69b40f18a6582fba0693c36c7040e724e4
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Jan 13 08:40:36 2014 -0600

    Added ome-web[234] to .ssh config.

commit 1f2f2663db5c0d954f6d4a567c31f384346de6d4
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Jan 11 22:23:17 2014 -0600

    added some knife aliases

commit a8bd78796b02994cb015833ab0e971da7e643738
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jan 3 14:14:36 2014 -0600

    Completed addition of LocalForward to ssh config.

    added LocalForward directive to all KSU servers.

commit 1bda5b2f40c86f6a0c3f0591569c433ec33c2084
Merge: eec89e1 539c9e9
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jan 3 11:21:05 2014 -0600

    Merge branch 'master' of github.com:zanshin/dotfiles

commit eec89e13e80e8bfdd339caed7bff9809e3a6fb23
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jan 3 11:20:17 2014 -0600

    Added attach alias.

    Created attach alias that either creates a new tmux session called `base`, or attaches to an already existing session called `base`.

commit 539c9e97ae53a7b9c62e5078468141eeccb0afc4
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jan 3 11:19:19 2014 -0600

    Added Port forwarding to ssh config.

commit 4ec19b3dca2e7ec80141e2701e4e0d246be76d87
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jan 3 11:06:28 2014 -0600

    Finally updated README to reflect account name change.

    Whoops.

commit 2ef849dd6969cf297bf1d8daf4ed6313a43610b8
Merge: 98d63c8 f878a4c
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Dec 25 22:54:17 2013 -0600

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      Refactored bashrc for multiple operating systems.
      Changed push.default from `simple` to `matching`.

commit 98d63c85e6a1e550eabfa1c9e879fba5628d8457
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Dec 25 22:52:17 2013 -0600

    Made vimrc gracefully degrade for servers with older vim versions.

    Added comment to rtp line.
    Added `if exists` test for relativenumber before setting it.

commit f878a4cb3618ef766e9e2460f41993e7ba9b34ef
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Dec 25 21:57:04 2013 -0600

    Refactored bashrc for multiple operating systems.

    Created three bashrc files: one each for Mac OS, SunOS, and Linux. These
    are sourced from primary `.bashrc` file based on the operating system of
    the local machine.

    Moved all aliases into bash_aliases.

commit e0d6462a85c65976595f235a1b8601a4d4337754
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Dec 25 21:55:17 2013 -0600

    Changed push.default from `simple` to `matching`.

    Version of Git on servers is behind the times (1.7.x) and doesn't yet
    support a push.default setting of `simple`.

commit 7b4bfbf2e14928f37d2fb5025c860ffd30a2123c
Merge: 9d5a0af 0e4a097
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Dec 24 10:17:09 2013 -0600

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      added attach alias for tmuxing

commit 9d5a0af268f1296d20641ff37b53c0c77886401e
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Dec 24 10:09:12 2013 -0600

    Fixd bash git-prompt so that it works properly.

    Had to source /usr/local/etc/bash_completion.d/git-prompt.sh in .bashrc to get
    git-prompt.sh working properly.

commit 0e4a0976206a3145abfdd3d3e0db626dc3912074
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Dec 18 13:57:09 2013 -0600

    added attach alias for tmuxing

commit 5559cdd82c3f1e72177c634ce29d361c8eadf3a5
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Dec 18 11:15:17 2013 -0600

    added takeover alias for remote tmuxing

commit 84658925baa533b0ffe704efef884d45a31fb3f8
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Dec 17 16:27:29 2013 -0600

    Change key binding for even-vertical

    New key binding to arrange panes in an even vertical arrangement overrode
    previous assignment for C-l (to cycle through panes). Changed even-vertical
    assignment to be C-i. Since i is next to o, its counterpart.

commit 9621961d34aa796d4e1394e58429cee5d416da77
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Dec 17 12:40:30 2013 -0600

    Updated tmux configuration for OME system administration.

    Added various key bindings to .tmux.conf, including shell script that opens
    multiple panes simultaneously, a pane synchronization option, and a zoom
    option.

    Added machines directory that lists by environment the server names. This is
    used by the tmux-multistart script.

commit 4be705629bac0770c357ca4d79f1e2bb6ae24f98
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Dec 16 13:44:15 2013 -0600

    Added pane synchronization toggle to tmux.

    Added line to tmux configuration that toggles pane synchronization within the
    current window.

commit dbc74ecc782d985365734920d58562de8355bbdb
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Dec 6 14:13:52 2013 -0600

    Cleaned up ssh config file.

    Organized servers into groups.
    Added TxHub 1 and 2 to list.

commit 3088c55eacd3eb6f4ac287737a878c9155adf999
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Nov 27 09:04:24 2013 -0600

    Updated .ssh/config

    Re-added port specification for Palantir as that machine is once again
    configured for using a port other than 22.

    Added configuration for Xendor (Chef Node)

commit 31d0b8f908803ba8b912552b43229e0c1155b378
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Nov 11 09:04:05 2013 -0600

    Updated Vim setup to include Vundle setup.

    When installing the Vim configuration for the first time on a machine, it will
    be necessary to install Vundle. Added a line explaining how to accomplish this.

commit d8da9c0343ea635f962c8b80755abd581ea3f1ed
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Nov 10 22:26:44 2013 -0600

    Added push setting to specify simple.

    As a part of Git 2.0, the push default is changing from matching to simple.
    Meaning that only the current branch (simple) will get pushed. Matching
    (meaning all branches) was the pre-2.0 default. I set mine to simple.

commit d4555dcfa5995970e2af181bb5e2bb9d67b74a10
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Oct 30 13:37:15 2013 -0500

    Removed NERD Tree plug in.

    Switching to netrw, which comes with Vim by default.

commit 39fca1747bf3475b9e224cdf14f9e323ba30de7e
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Oct 25 10:01:22 2013 -0500

    Updated format options, removed tabline.

    Expanded formatoptions and added comments explaining settings.

    Removed tabline setup as mini buffer explorer is now installed.

commit 55a51edee3057c1271825fc86e433bbfd10dbfe0
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Oct 16 09:03:38 2013 -0500

    Setup O365 account.

    Made necessary changes to add work Office365 account to the mix.

commit 4f252064f10ebff07c19a200aff5a177490ba5ed
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Oct 14 22:52:00 2013 -0500

    Updated account information for IMAP account.

    Copy paste error strikes again. Whoops.

commit 984e79be9a6451a3297a91915d61ad7207d1d9b1
Merge: e7308b1 c7033d9
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Oct 14 20:37:30 2013 -0700

    Merge pull request #3 from zanshin/imap

    Added IMAP account as second account.

commit c7033d980b6eb1b6c287ab3619374cb0f574e094
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Oct 14 22:31:57 2013 -0500

    Setup second account.

    Added an IMAP account to the mix.

    Added accounts sub-directory to .mutt directory to hold a file for each
    account. These are sourced from within the primary .muttrc file.

    Removed account specific information from muttrc.

    Added second account to offlinemaprc so that mail can be retrieved.

    Added second account to msmtprc so that mail can be sent.

commit 7ba0bfc3502bbc525b53e621bf75867c5ceaf10a
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Oct 13 22:47:28 2013 -0500

    Cleaned up .offlineimaprc.

    Cleaned up alignment of attributes in .offlineimaprc file.

commit 2054c052036ffaf5a16787adef33297896e6539d
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Oct 13 22:33:06 2013 -0500

    Theme settings and moved .offlineimap directory

    Added themes sub-directory to hold .muttrc files that describe color themes
    MOdified muttrc to set a theme

    Untracked .offlineimap directory as it shouldn't be under version control.
    Whoops.

commit e7308b1a75d1ed8f692d9b031a3283fa4f429dbb
Merge: 3ee75b4 62ed346
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Oct 12 14:28:34 2013 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      Completed basic mutt setup prior to O365

commit 3ee75b4037d693a05a82591c0e1653528832cf6b
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Oct 12 14:27:54 2013 -0500

    Added mutt alias.

    Added alias to ensure that mutt is always run with Desktop focus so that
    attachments et cetera are saved there.

commit 62ed346f8b31c7bc4e7121401c1a1e071899796b
Merge: 28d6936 107c505
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Oct 12 12:27:10 2013 -0700

    Merge pull request #2 from zanshin/outlook

    Completed basic mutt setup prior to O365

commit 28d69367ca80973721a3f50a64d59d6a2a965c58
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Oct 12 14:10:47 2013 -0500

    Added markdown syntax plugin.

    Somehow missed doing this before. Giving one a try.

commit bbc35cd86111b512554eb9c172f98bcd69ba05f3
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Oct 12 08:21:55 2013 -0500

    Added line movement mappings.

    Added mapping to allow lines (block or individual) to be moved up or down via
    C-j or C-k.

commit 6ccc98f528a8abe17b243d1baf110d5cdc03effd
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Oct 12 08:18:24 2013 -0500

    Removed old line number scheme

    With Vim 7.4 relative and absolute line numbering work in conjunction with each
    other meaning I no longer need the complicated set of code for determining
    modes and which line numbering system to use. Less code is better.

commit 107c50577c92b417efaf2fb16de9d99cc2c57484
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Oct 12 08:16:34 2013 -0500

    Completed basic mutt setup prior to O365

    Complete mutt setup for GMail account in preparation for attempting to setup
    Office 365 account.

commit 7c2a057ad6e1ef9a0bc795110d686efe2eb8d016
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 24 09:34:34 2013 -0500

    Removed homegrown number setup, added number.

    New version of Vim (7.3.1115) allows for both relativenumber and number to be
    set. When both are set you get an absolute number on the current line and
    relative numbers elsewhere.

commit b474e866dbbb0e86a296afa8e16866cc42631531
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 24 09:33:22 2013 -0500

    Added en3 to status line

    Added IP address from en3 to status line in order to show Lightning Ethernet
    adapter. Increased left side status width to allow for additional address.

commit 73449c3316e6df780159c54bbc1bed072f8be88a
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 24 09:32:28 2013 -0500

    Added TxHub servers

    Added entries for ome-dev-txhub[12].cc.ksu.edu to config.

commit f4ef766987abf340222a367d1fe8ff0d94c8c721
Merge: cf7ddd1 6176463
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 10 13:16:41 2013 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      cleaned up spacing in tmux status bar

commit cf7ddd1bdd6dad875e4ab8bdf491f583f9a9d7ab
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 10 12:59:14 2013 -0500

    Changed markdown wrap length and leader timeout.

    Added local setting for markdown file types to increase line length to 100
    characters. 79 was to short, particularly with embedded URLs.

    Tweaked leader timeout value. Mappings now get 1 second and key codes 1/2
    a second before timing out.

commit 61764639f47d381358ed2f600f9360834bff5743
Merge: 3f02f65 2b073a5
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 10 08:54:22 2013 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      Abandoning shift-Q as a way to get to ex mode.

commit 3f02f6522aa95ae3e615021b08c785e9cbb2792e
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 10 08:54:17 2013 -0500

    cleaned up spacing in tmux status bar

commit 2b073a5e1d92e9aa4779a65ef8564eaf8cd1047d
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 9 15:08:30 2013 -0500

    Abandoning shift-Q as a way to get to ex mode.

    Many years ago (more than 15) when I first used vi I learned to use shift-Q to
    enter ex mode and then type things like w or q. Now in Vim you have to type
    `visual` or `vi` to exit ex mode, which is cumbersome. So. Mapped ; to : making
    it one less key stroke to type : commands, and mapped Q (shift-q) to no-op to
    break my ancient bad habit.

commit 6b98b71ca81378cdee8c2cdf516dc3471200ed1e
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 9 14:51:19 2013 -0500

    Changed mapping to remove search highlights.

    Trying to use the Preserve function to remove search highlights wasn't working
    so remapped that feature. Now <leader>/ will remove search highlights. Which
    has nice parity with / being used to initiate a search.

commit ddbda28857a77078a0c5f7f3d6b5eaa36e11afe7
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 9 14:00:58 2013 -0500

    Added Vimux and mappings.

    Added the Vimux bundle via Vundle. And added statements to configure it to my
    liking. Also some basic usage mappings and some Octopress specific mappings.

commit 3338cda1a29660bab61c13b10a44bc8b502683b0
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Sep 6 14:19:50 2013 -0500

    Cleaned up comments, add line number function.

    Cleaned up all comments, added section outlines.
    Add relative/absolute number function and settings.
    Removed home grown status line.
    Re-group settings more logically.

commit 60ee2a90465fbd5022af63682309fcf0f452f8d3
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Sep 6 10:17:00 2013 -0500

    Reverted editor back to just 'vim' in gitconfig.

    While testing problems with vim-airline editor designation in gitconfig had
    been changed to use full executable path and foreground flag. Revert to just
    'vim' with no foreground flag now that airline is working properly.

commit 22822d9d4bdbad113bb769977b874962e1619dad
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Sep 6 08:57:04 2013 -0500

    Set Berkshelf files to have ruby file type.

commit 0978765e7b511f026edb59d7de1ea572efed3bff
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Sep 6 08:47:13 2013 -0500

    Vimrc changes.

    Moved code folding and mouse hiding settings to be with other basic settings.

    Switched search highlighting toggle to use Preserve function.

    Setup Git commit messages to start in insert mode.

commit 90cfe7838dde5d92ba7ce63a8afa1c4db35ed21e
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Sep 6 08:13:01 2013 -0500

    Added Preserve function; used for whitespace.

    Added function that preserves current search history and cursor position and
    then used function to create mapping that removes all trailing whitespace from
    the file. Also a mapping that reformats entire file to correct indentation formatting.

commit d89140fc7bcac15246082f85fd1b30a03e999771
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Sep 6 07:48:30 2013 -0500

    Use unnamed clipboard and scroll settings.

    Use the unnamed clipboard for better integration with host OS.
    Set scrolling attributes so that cursor stays away from vertical and horizontal
    edges of the screen until the end of the line or file is reached.

commit 335b95748fb769568458e8e6aada6307c44a10bc
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Sep 5 10:40:40 2013 -0500

    updated README to remove tmux-powerline reference

commit 8684e83a5ef13ef20b0d2e7ee0f52e90809fab16
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Sep 5 10:39:28 2013 -0500

    removing tmux-powerline and associated scripts

commit 1f28aeaf74e82f47bda5c21a2648147aff0a8d4e
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 21:07:06 2013 -0500

    formatting changes to IP addresses in tmux status bar

commit c937513698bf5ac71a001e8ed992e8d29af9191d
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 15:30:55 2013 -0500

    parsed ifconfig output for vpn IP address in tmux status line

commit a90293cd09c8290de297fdc8eccc76a25314f642
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 13:54:10 2013 -0500

    whoops. awk isn't as straight-forward as it looks.

commit 13c1d10aaca94e66da308026e4babe68730bd65e
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 13:50:08 2013 -0500

    cleaned up vpn pid presentation in tmux status bar

commit 57c950cb598e374874fafef82561feb24346acd8
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 13:47:08 2013 -0500

    added vpn pid to tmux status bar when vpn running

commit 461fcb669bb5056004cb40876cc0108be213dc91
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 13:46:40 2013 -0500

    fixed path to openconnect configuration file in vpn alias

commit 703054800b957b764b2a4f8570b2086e90fd06fe
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 13:22:27 2013 -0500

    changed search highlight remove to <F3>. space was a poor choice

commit 51eb6ddc8c341b57a67f5146a5e681de60895e6e
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 13:13:53 2013 -0500

    added openconnect vpn alias

commit 5738c9760fe0d442c948c32eb16f6305874c2b2c
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 11:12:32 2013 -0500

    changed search highlight toggle to <space>

commit f9c80e194dd5bfd1157973dddf859d4618ca6e64
Merge: ebdc093 b6b817b
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 11:09:58 2013 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      added mapping to clear search highlights

commit ebdc0933e1ccbe38b6b3c17fdc77a66bbd40da07
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Sep 4 11:09:50 2013 -0500

    refactored copy/paste settings

commit b6b817b25ed5ee9c32fd1113a0428d3ef3b82de5
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 3 22:30:07 2013 -0500

    added mapping to clear search highlights

commit b63e8c4c328617066f97c9de14000a8a12220913
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 3 15:39:41 2013 -0500

    Further tweaks to tmux status bar.

    Figured out how to colorize status bar background. Added section delimiters.

commit 1b1fc856ab9241e9ec7d7b730aea7924910297f0
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 3 13:50:16 2013 -0500

    Restructured status line, added UTC time.

    Restructured left and right sides of status line in tmux. Added IP addresses:
    en0 and external. Added UTC time to status line.

commit 4e396ebaee706d1b441c64a38c5b40a09633a2fc
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Sep 3 10:07:21 2013 -0500

    Added let g:airline_theme='dark' to vimrc.

    By setting a theme the theme switching code is avoided, and this seems to get
    around the exit code problem when editing git commit messages.

commit 36a7e9a9aac35f06f2bfe66205e9d2a1022db740
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 2 23:33:34 2013 -0500

    ST2 last run, settings

commit e774fea2818564c676ceb0df7aab5e89a14b5bef
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 2 23:32:18 2013 -0500

    Refactored tmux configuration.

    Eliminated use of tmux-powerline for status line.
    Added hand-coded status line.
    Added Solarized colors.

commit 76cc7b76e0f7bc2b0407a372f2bc58e69d1fb1cd
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 2 22:41:14 2013 -0500

    Removed tracking from Vim bundles.

    .gitignore is set to ignore vim/bundle but needed to remove Git tracking from
    those directories.

commit 602ad16372fecb3aae2a7d935af9918f55fc54b7
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 2 22:34:49 2013 -0500

    Safed colorscheme setup and removed vim-airline colorscheme.

    Set editor background to dark and added silent test to color scheme assignment.
    Commented out color setting for vim-airline.

commit 4b72c3f2c1aa196ce101df4a6832616481d1f22b
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 2 13:08:54 2013 -0500

    turned show command off now that airline is working

commit 0cd4c05fa51e0304d4c7e0ec85fb7747a2e42374
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 2 13:06:05 2013 -0500

    changes to vim-airline to get it working.

commit 18a707bd61b3a5f91813d573de086872734dce38
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 2 13:03:21 2013 -0500

    Commented out homegrown status line, added Ruby file types.

    Added several additional file types to Ruby list.

    Commented out homegrown status line as it appears vim-airline is working now.

commit 55006f840162e1f54e89e2b6b32c2c4228cd3cfa
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Sep 2 13:02:13 2013 -0500

    added path to vim/bundle to ignore list. tidier

commit d6ed7f15659b16828b035038a2ff9c4b68ed1439
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Aug 31 12:35:40 2013 -0500

    turned showmode on again and setup homegrown status line

commit 6a94b88d0c7bb7b02e9a7fccf8d80c35e65929b7
Author: Mark Nichols <mark@zanshin.net>
Date:   Sat Aug 31 12:35:07 2013 -0500

    added background flag to vim command

commit 3e1529137e741eec51165dcf130e00ce7991da6a
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 23:19:43 2013 -0500

    set vimdiff as mergetool

commit 7512b3a26f3349568a7796e721bdcf8beadd14fe
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 23:08:17 2013 -0500

    cleaned up whitespace. reset difftool to vimdiff. removed mergetool

commit 094d0c56326596c93f6038f399777b078c78f4a7
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 22:47:24 2013 -0500

    Added git commit spell check, current line highlighting, turned off show command

commit b3ed323d9d4804d95018a96ecee5910de5cbdd68
Merge: 9d9a96d a47957c
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 13:47:22 2013 -0500

    adding vundle updates from origin repo

commit 9d9a96de14d39ceb1e93687e5daf9b63add73ab3
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 13:46:42 2013 -0500

    added sane setting for backspace key

commit a47957c066695f14fccc608ac30d5dbf7a676a9d
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 09:36:42 2013 -0500

    adding new vundle bundles to palintir

commit 891da4a74eca4b30d72b472b8c7e78ce09912648
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 09:32:41 2013 -0500

    added <C>hjkl mapping for split navigation

commit a5b9be520b77bc06f958c68cd2f4490af2f410e4
Merge: e68008e e3f0a7c
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 09:24:35 2013 -0500

    commiting merge following pull

commit e68008e4fe35b67e2f821a2deb888a5eef9fc1e4
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 30 09:23:23 2013 -0500

    added vim-airline and configured same. added vim-fugitive

commit e3f0a7c98f0352d0bc762e3fca47bc5f250cbea1
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 29 15:41:41 2013 -0500

    updated and now vundle needs to be committed again.

commit 30fc0a905eeea4b855e8706707fa77d893da50e6
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 29 15:26:50 2013 -0500

    added <nop> mappings to arrow keys.

commit 7ffaaa858ea3398ae8f058957a3911ea45c11cc3
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 29 13:21:35 2013 -0500

    added toggle for list to turn listchars on or off

commit 1b02e2a35cb435cffbf65f5dbb54749b87efba8c
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 29 13:18:44 2013 -0500

    updated listchars with trail and nbsp

commit f2eb03c71a51196d739693b587e34807b8c6f514
Merge: 20f1ab7 469363c
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 29 13:08:10 2013 -0500

    capturing Vundle changes

commit 20f1ab775ce3270c4dcdc2cf59518200104c11fb
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 29 13:07:10 2013 -0500

    vimrc clean up

commit 469363c7723d35d7af8f1ba0dbccd46c3c072b3f
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 29 08:49:33 2013 -0500

    added Vundle and installed bundles using same

commit 7f53906ea9b4fc1d30437565e7037c24687de348
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 29 08:45:30 2013 -0500

    removed vim submodules from dotfiles.

commit d2947724e39fbe9e5ad01bd3c820f1278b2441ec
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 22:52:35 2013 -0500

    eliminate swap and backup files and setup pastetoggle

commit 7fc797923f3eaf1a24877776f48700fb52802c43
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 21:13:03 2013 -0500

    minor updates to README

commit 9c4d0acc218ed3fcfcd3b844891c790e084686ce
Merge: c69593d 26ae098
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 19:03:02 2013 -0700

    Merge pull request #1 from zanshin/vim-refactor

    Vim refactor

commit 26ae098018b4ff858c357d345b3c5723a29c4abe
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 21:00:36 2013 -0500

    updated dotfiles README for new Vim setup

commit 9f113118df43bce7e1689afc4c359e9bc145e755
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 21:00:08 2013 -0500

    added words to spelling dictionary

commit b42a4907f178d197dc8e36d9f13e9a919c265a9c
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 20:59:08 2013 -0500

    added spelllang=en_us for markdown files

commit b35d4ef50406916b8ecc9fa9f058516ec997fd44
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 20:30:05 2013 -0500

    removed pathogen.vim from autoload

commit 6e10db5462b867b9a8ec02cbf288c3f12d12c229
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 16:28:05 2013 -0500

    replaced original vimrc with new vimrc

commit d87fa2aaab8b4b41f296d7b257b4da93b9a14e4a
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 16:22:09 2013 -0500

    installed Vundle and added several vim bundles

commit 02638aa484c0f47a382c17cb8636cc278b0812d8
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 16:11:43 2013 -0500

    removed all vim related submodules

commit c69593d9531c7dbe3e89186a391de7d182271b22
Merge: dd250f2 a310482
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 15:55:05 2013 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      added search highlight clear to vimrc

commit dd250f214db72d98bc6aacf44052b66bce1df2da
Author: Mark Nichols <mark@zanshin.net>
Date:   Wed Aug 28 15:54:52 2013 -0500

    added cookbook alias

commit a310482873e46789d79fa8edd3180f20832b36dc
Merge: 2b52ff2 e949dbf
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Aug 25 16:37:47 2013 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      removed s alias for sublime text as it was colliding with s function. whoops

commit 2b52ff27aa999fb597b75b7a0325797634eab8c8
Author: Mark Nichols <mark@zanshin.net>
Date:   Sun Aug 25 16:35:27 2013 -0500

    added search highlight clear to vimrc

commit e949dbf2dc386aa2b0aaaad1a77f3a2790b67b61
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Aug 22 08:29:07 2013 -0500

    removed s alias for sublime text as it was colliding with s function. whoops

commit fcc5ea713cf7a4e9dc3768e13fe4ddb21e23052d
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Aug 12 09:14:45 2013 -0500

    added gigue ssh config entries to master

commit de57fad0178e2f3333fbc8dd38359027be87c006
Author: Mark Nichols <mark@zanshin.net>
Date:   Mon Aug 12 09:08:22 2013 -0500

    Added ssh config to dotfiles.

    Updated my minimal ssh config file to contain all the remote hosts I use
    reqularly. Added new directory to dotfiles setup called ssh, and moved config
    file to this location. Updated README to include symlink setup for ssh config.

commit d312cfbec963f4af99991c9b15cd69bb1776ff26
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 9 13:46:56 2013 -0500

    more aliases

commit 890e619c1f5a98f368e8a0f7341007b5371bcf24
Merge: fa05ac8 2bf6536
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 9 08:57:20 2013 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      added ps with grep function to aliases
      added chef ssh alias for personal chef server
      tweaked battery color in tmux powerline (default.sh)

commit fa05ac8d79732bd2a3d11bb7534df5ae52aadd6d
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 9 08:57:10 2013 -0500

    capturing latest ST2 last-run information

commit 2bf6536fbce2b62226fbdb2bf3c3b69fc9e9d0d6
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 9 08:56:20 2013 -0500

    added ps with grep function to aliases

commit e1e847f11772af5403c263c1d5fc0b96fbeef5e0
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Aug 9 08:56:08 2013 -0500

    added chef ssh alias for personal chef server

commit d65768157dfc18898750c17f7fd3147caa1364ae
Author: Mark Nichols <mark@zanshin.net>
Date:   Thu Jul 25 14:21:49 2013 -0500

    tweaked battery color in tmux powerline (default.sh)

commit 169463dc044b44d4309ed5c15b8b0e31554df05a
Merge: 885e340 14bef05
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jul 12 13:04:53 2013 -0500

    Merge branch 'master' of github.com:zanshin/dotfiles

    * 'master' of github.com:zanshin/dotfiles:
      turned battery display on in tmux status bar
      fiddling with tmux copy settings
      mucking about with copy/paste settings
      added tools alias to zsh/aliases.zsh

commit 885e3409203878a984f0e19aefe2e7e6ab5e6c3e
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jul 12 13:04:37 2013 -0500

    added scroll past end and slow plugin detection options to ST2

commit 14bef05bae39b8d68d99b21956eeda51fc230f2d
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jul 12 13:01:22 2013 -0500

    turned battery display on in tmux status bar

commit db73d10a5185e5c1629348663a6cc731a5f13e17
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jun 28 09:31:47 2013 -0500

    fiddling with tmux copy settings

commit 30733474ab162918be4e7bfce022a14f2d9415e1
Author: Mark Nichols <mark@zanshin.net>
Date:   Fri Jun 14 14:27:51 2013 -0500

    mucking about with copy/paste settings

commit 0b34ec2f12968349189f9e8f5f43d6a6d4024250
Author: Mark Nichols <mark@zanshin.net>
Date:   Tue Jun 4 09:58:05 2013 -0500

    added tools alias to zsh/aliases.zsh