Cleanup code formatting and jshint errors
Merge branch 'pr/39' into config_parser