redock needs to be done before dock usage is checked on OS X
Merge branch 'master' of github.com:bripkens/dock