converts README to markdown format
removes git merge marker
Merge pull request #1 from spazm/dev

formats README and fixes dev/uwsgi.ini