Finished python
Merge branch 'master' of http://github.com/tolster710/setup