Merge branch 'develop' of github.com:project8/Pypeline into develop
used replace built in method rather than python_is_horrible() custom function
Seriously, soft tabs.
Merge branch 'develop' of github.com:project8/Pypeline into develop
Fixed indention error.
more whitespace fixes