Added more robust command options
Merge branch 'master' of https://github.com/Olog/pyOlog
Merge pull request #2 from NSLS-II-CSX/master

Bugfixes