set file extension txt to asciidoc filetype
use solarized everywhere
free ctrl-p binding (used for ctrlpbuffer) to use it as default vim mapping (again)
Update README.markdown

fixed typo (or perhaps changed syntax) for Surround quick help
Merge pull request #485 from aauthor/sd-typo_fix

Update README.markdown
added solarized initialization
reducted spf13 groups to minimum
Merge remote-tracking branch 'upstream/3.0' into 3.0