Dictate how to align function arguments

Also clean up trailing whitespace.

Also change all elided code to "...".
Merge branch 'master' into functionargumentalignment

Conflicts:
	README.md
Remove a contentious example of function argument indenting
Merge pull request #15 from airbnb/functionargumentalignment

Dictate how to align function arguments