Touch up spelling and grammar.
More grammar touchups.
Refined the intro and installation sections.

Hello,

I saw the liquidprompt on Hackernew. 
I tried to give it a more catching intro to focus on 
why a new user should use it and how it helps them save time. 

I also tried to state the install section more clearly. 
This way users can testdrive it quicker. 

Congrats on the Hackernews list. 
I hope you accept these changes.
Fixing an issue where logname might not return the right value, but
$LOGNAME does
Allow setting the color on the virtualenv display
Add enabling virtualenv option to the liquidpromptrc-dist
bugfix analog time with a correct and faster implementation
Merge branch 'master' of https://github.com/thanatos/liquidprompt into develop
Merge branch 'patch-1' of https://github.com/rvanlaar/liquidprompt into develop

Keep the new intro from rvanlaar
Conflicts:
	README.md
Merge branch 'logged-in-user-fix' of https://github.com/jab416171/liquidprompt into develop
Merge branch 'master' of https://github.com/cyli/liquidprompt into develop
Cygwin lack of 'o' option for ps shows error messages on every prompt

Cygwin doesn't support the 'o' option for ps (version: ps (cygwin) 1.7.17), which causes errors to show on every prompt
displayed. A simple fix is redirecting stderr to /dev/nullin liquidprompt/liquidprompt (it might actually be a good idea
to do the same for other commands, since any kind of undesired output makes the prompt pretty much blow up).
Add a special mark when in a disabled VCS repository

This adds the LP_MARK_DISABLED (default: "⌀"), used as a prompt mark
when in disabled repositories (see `LP_DISABLED_VCS_PATH`).
Only show the branch specifier if the current directory is part of a git repo
Merge branch 'git-untracked-dir' of https://github.com/jab416171/liquidprompt into develop