Updates README to include server conf files documentation.
Updates fab super_merge command to include init-tumblr branch. [Closes #118].
Merge branch 'master' into init-tumblr