cleaning up root directory a little bit
tweaking .gitignore
cleaning up conflicts
Merge branch 'master' of github.com:jduncan-rva/newRHELic
merge confusion