Merge https://github.com/donnemartin/dev-setup

* https://github.com/donnemartin/dev-setup:
  Remove deprecated brew commands (donnemartin#98)
  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)

.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

brew.sh

@@ -31,10 +31,9 @@ brew install moreutils
 # Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed.
 brew install findutils
 # Install GNU `sed`, overwriting the built-in `sed`.
-brew install gnu-sed --with-default-names
+brew install gnu-sed
 # Install Bash 4.
 brew install bash
-brew tap homebrew/versions
 brew install bash-completion2
 # We installed the new shell, now we have to activate it
 echo "Adding the newly installed shell to the list of allowed shells"
@@ -133,7 +132,7 @@ brew link libxml2 --force
 brew link libxslt --force
 
 # Install Heroku
-#brew install heroku-toolbelt
+#brew install heroku/brew/heroku
 #heroku update
 
 # Core casks
@@ -170,7 +169,7 @@ brew install boot2docker
 
 # Install developer friendly quick look plugins; see https://github.com/sindresorhus/quick-look-plugins
 # Note: betterzipql got integrated into betterzip which is not free
-brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv qlimagesize webpquicklook suspicious-package
+brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv qlimagesize webpquicklook suspicious-package quicklookase qlvideo
 
 # Personal installations
 brew cask install vemoxy/devsetup/steelseries-exactmouse-tool

osxprep.sh

@@ -17,4 +17,4 @@ sudo softwareupdate -ia --verbose
 echo "------------------------------"
 echo "Installing Xcode Command Line Tools."
 # Install Xcode command line tools
-xcode-select --install
+xcode-select --install