Merge pull request #66 from spacewander/master

翻译于2014/7/16
daily translating patch jul 16
daily translating patch jul 17
daily translating patch jul 18
daily translating patch jul 19
pull from commandlinefu.com
Jul 20 daily translating patch
Merge pull request #67 from particle128/master

Jul 20 daily translating patch
daily translating patch jul 20
translating on July 21st