more stuff with the travis keys and deploy
adding windows agent to the top level make file
Oops make agent requires root permissions
more clean up for make clean'
Convert csyslog JSON output to use the cJSON library.
Git ignore for files which we build
Ignore cJSON.h
Linking and libraries sorted out.
Something isn't building, guessing that it's the eventchannel stuff.
Fully remove the event channel stuff.
I guess this is stupid too.
Merge pull request #49 from reyjrar/fix/use-cjson-csyslogd

Use cJSON instead of writing a custom JSON output format.
fixing the merge
setenv is not avaiable on Win32

This quick fix will add setenv function using the avaiable putenv call.
This should be in a win32 shared section of the code, but I will take
care of that as I clean more of the win32 build process up.
Merge pull request #53 from jrossi/travis-ci-build-windows

Travis ci build windows and fix for setenv not being avaiable on win32
Merge branch 'master' of https://github.com/ossec/ossec-hids
Merging in changes from @cgzones
Merge pull request #55 from jrossi/cgzones-make-clean-binaries

Merging in changes from @cgzones
merging in @cgzones geoip clean
Merge pull request #56 from jrossi/cgzones-geoip-cleanup

Cherry-picking in @cgzones geoip clean