add strip extension
Merge remote-tracking branch 'origin/master'
texlive 2013 -> 2014
add ediff