Merge pull request #1 from robbywashere/gulp_emit_error

Gulp friendly errors
minor changes to error handling