Merge branch 'master' of https://github.com/donnemartin/dev-setup

* 'master' of https://github.com/donnemartin/dev-setup:
  Fix grammar in .dots script (donnemartin#87)
  Fix donnemartin#84: Update softwareupdate verbose flag (donnemartin#90)
  Update list of Quick Look plugins (donnemartin#77)
  Install Heroku CLI from heroku/brew/heroku (donnemartin#93)
  Replace betterzipql with betterzip (donnemartin#92)
  Remove redundant cask install from android.sh (donnemartin#75)
  Remove redundant cask install from brew.sh (donnemartin#74)
  Set blazingly fast keyboard repeat rate (donnemartin#76)

.dots

@@ -35,7 +35,7 @@ function runDots() {
             echo ""
             echo "------------------------------"
             echo "Installing Homebrew along with some common formulae and apps."
-            echo "This might awhile to complete, as some formulae need to be installed from source."
+            echo "This might take a while to complete, as some formulae need to be installed from source."
             echo "------------------------------"
             echo ""
             ./brew.sh

android.sh

@@ -18,12 +18,8 @@ fi
 # Make sure we’re using the latest Homebrew.
 brew update
 
-# Install Cask
-brew install caskroom/cask/brew-cask
-brew tap caskroom/versions
-
 brew cask install --appdir="~/Applications" java
-brew cask install --appdir="~/Applications" Caskroom/versions/intellij-idea-ce
+brew cask install --appdir="~/Applications" intellij-idea-ce
 brew cask install --appdir="~/Applications" android-studio
 
 brew install android-sdk

brew.sh

@@ -133,13 +133,9 @@ brew link libxml2 --force
 brew link libxslt --force
 
 # Install Heroku
-brew install heroku-toolbelt
+brew install heroku/brew/heroku
 heroku update
 
-# Install Cask
-brew install caskroom/cask/brew-cask
-brew tap caskroom/versions
-
 # Core casks
 brew cask install --appdir="/Applications" alfred
 brew cask install --appdir="~/Applications" iterm2
@@ -172,7 +168,7 @@ brew install docker
 brew install boot2docker
 
 # Install developer friendly quick look plugins; see https://github.com/sindresorhus/quick-look-plugins
-brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzipql qlimagesize webpquicklook suspicious-package
+brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzip qlimagesize webpquicklook suspicious-package quicklookase qlvideo
 
 # Remove outdated versions from the cellar.
 brew cleanup

osx.sh

@@ -185,7 +185,8 @@ defaults write com.apple.universalaccess closeViewZoomFollowsFocus -bool true
 defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false
 
 # Set a blazingly fast keyboard repeat rate
-defaults write NSGlobalDomain KeyRepeat -int 0
+defaults write NSGlobalDomain KeyRepeat -int 1
+defaults write NSGlobalDomain InitialKeyRepeat -int 15
 
 # Set language and text formats
 #defaults write NSGlobalDomain AppleLanguages -array "en"

osxprep.sh

@@ -10,11 +10,11 @@ while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
 echo "------------------------------"
 echo "Updating OSX.  If this requires a restart, run the script again."
 # Install all available updates
-sudo softwareupdate -iva
+sudo softwareupdate -ia --verbose
 # Install only recommended available updates
-#sudo softwareupdate -irv
+#sudo softwareupdate -ir --verbose
 
 echo "------------------------------"
 echo "Installing Xcode Command Line Tools."
 # Install Xcode command line tools
-xcode-select --install
+xcode-select --install