Merge latest from 'upstream/master' (geerlingguy/mac-dev-playbook)

README.md

@@ -52,7 +52,9 @@ Applications (installed with Homebrew Cask):
   - [Firefox](https://www.mozilla.org/en-US/firefox/new/)
   - [Google Chrome](https://www.google.com/chrome/)
   - [Handbrake](https://handbrake.fr/)
+  - [HipChat](https://www.hipchat.com/)
   - [Homebrew](http://brew.sh/)
+  - [Java](https://java.com)
   - [KDiff3](http://kdiff3.sourceforge.net/)
   - [LICEcap](http://www.cockos.com/licecap/)
   - [LimeChat](http://limechat.net/mac/)
@@ -73,6 +75,7 @@ Packages (installed with Homebrew):
 
   - autoconf
   - bash-completion
+  - chromedriver
   - doxygen
   - gettext
   - git

default.config.yml

@@ -20,6 +20,7 @@ homebrew_installed_packages:
   # - ansible # Installed via Pip.
   - autoconf
   - bash-completion
+  - chromedriver
   - doxygen
   - gettext
   - git
@@ -67,11 +68,14 @@ homebrew_cask_apps:
   - firefox
   - google-chrome
   - handbrake
+  - hipchat
+  - java
   - kdiff3
   - licecap
   - limechat
   - macvim
-  - yujitach-menumeters # Note: Using forked version for 10.11+ support
+  # - menumeters
+  # - yujitach-menumeters # Forked version for 10.11+ support.
   - nvalt
   - sequel-pro
   - skype

files/sublime/Library/Packages/User/Package Control.sublime-settings

@@ -17,9 +17,7 @@
 		"Sass",
 		"SublimeCodeIntel",
 		"SublimeLinter",
-		"SublimeTableEditor",
 		"TrailingSpaces",
-		"WordCount",
 		"Xdebug Client"
 	]
 }