Add texlive-2013 settings
Merge remote-tracking branch 'upstream/master'
track original