Merge pull request #18 from mmerickel/master

markup fixes in readme
cleanup setup.py for fun
Merge pull request #19 from mmerickel/fix.setup.py

cleanup setup.py for fun