fixing building of ffmpeg with x264
Merge branch 'master' of https://github.com/meduz/dotfiles

* 'master' of https://github.com/meduz/dotfiles:
  settings for the dock
 adding a script to install TexLive on a mac using MacTex / then setting some useful default values "