removed parse.pyc
Merge branch 'master' into cleanup