Merge develop -> master.

* Vim -- Markdown formatting support.
* Vim -- Proper tabbing/spacing for Java source files.