whole bunch of stuff added
Merge branch 'master' of github.com:indika/PyCharm30