Prefer the &: shorthand for blocks that are a single attribute read or
method call.
Merge pull request #9 from airbnb/prefer-proc-shorthand

Prefer the &: shorthand for blocks that are a single attribute read or method call.
Add Rails section and rule around use of render and return
Reword render and return rule per Topher's suggestions
Rant against annoying "unless" and modifier if/unless.
if/unless, remove useless section about newlines.
"that's just a lot of punctuation"
Merge pull request #11 from airbnb/ugh

For cleaner "if"/"unless" usage
Avoid "unless" with multiple conditions
Reorder whitespace subsections.
Dictate how to align function arguments

Also clean up trailing whitespace.

Also change all elided code to "...".
Remove needless section inherited from github style guide.
Merge pull request #10 from airbnb/render-and-return

Add Rails section and rule around use of render and return
Add recommendation for proper TODOs in the codebase.
Fix TODO markdown.
Add a ridiculous nickname example.
Use the existing TODO comment section and delete the new one.
Merge pull request #16 from airbnb/stupidgithubstyleguide

Remove needless section inherited from github style guide.
Merge branch 'master' into functionargumentalignment

Conflicts:
	README.md
Remove a contentious example of function argument indenting