Depend on cpymad rather than pymad

Update necessary due to cpymad becoming an independent package.
Minor changes to line spacing in setup.py
Merge branch 'cpymad'