synchronise with mdo/code-guide https://github.com/mdo/code-guide on 2014-5-5

[materliu]

synchronise with mdo/code-guide https://github.com/mdo/code-guide on 2014-7-15