Merge pull request #21 from genebean/mods_from_work

Mods from work

.gitignore

@@ -13,7 +13,11 @@ link/nix/config/grv/
 link/nix/config/gtk-2.0/
 link/nix/config/htop/
 link/nix/config/hub
+link/nix/config/Microsoft\\VisualStudio Services/
 link/nix/config/NuGet/nuget.config
 link/nix/config/powershell/powershellget/
+link/nix/config/puppet/
 link/nix/config/QtProject/
 link/nix/config/tmuxinator/
+link/nix/config/wireshark/
+

link/nix/zshrc

@@ -86,9 +86,9 @@ gpg-connect-agent updatestartuptty /bye >/dev/null
 alias biv='bundle install --path=vendor/bundle'
 alias gbc='git branch --merged | command grep -vE "^(\*|\s*(master|develop|production)\s*$)" | command xargs -n 1 git branch -d'
 alias sal='ssh-add -L'
-alias ogk='/Applications/GitKraken.app/Contents/MacOS/GitKraken &'
+alias ogk='open -a GitKraken'
 alias sz='source ~/.zshrc'
-alias st='/Applications/SourceTree.app/Contents/MacOS/SourceTree &'
+alias st='open -a SourceTree'
 alias ykey='pkill gpg-agent && source ~/.zshrc; ssh-add -L'
 
 # this makes grv from homebrew work
@@ -123,6 +123,8 @@ export PATH=$PATH:~/.nexustools
 if [[ `uname` == 'Darwin' ]]; then
   export PATH=$PATH:/usr/local/sbin
 
+  alias flushdns='sudo killall -HUP mDNSResponder'
+
   # Araxis needs to come first so that its tools don't get stomped
   # by ones Homebrew installs to /usr/local/bin. In particular, compare
   # from ImageMagick breaks using git difftool.

link/ssh/config

@@ -2,3 +2,5 @@ Host *.westga.edu
   User ven-gliverman
 HOST *.delivery.puppetlabs.net
   IdentityFile ~/.ssh/id_rsa-acceptance
+Host beanbag.technicalissues.us
+  User gliverma