Remove extraneous vim configuration comments

Remove line containing

comment - # vim: tabstop=4 shiftwidth=4 softtabstop=4

Change-Id: I6e486876d5743bfbfb3a93c89f6da81c32d22ffd
Closes-Bug:#1229324
Fix docstring of parsing order

There is wrong explaination of option parsing order in config files
and on command line. That is only the later one takes action.
The sample code shows only the later one takes action.
See http://paste.openstack.org/show/64229/

Change-Id: I4d48df1b551bb130dc25fe32303fa2d0b1fecffd
Merge "Remove extraneous vim configuration comments"
Merge "Fix docstring of parsing order"