Modified headers to prevent name collision
Merge branch 'master' of git://github.com/erikekahn/gunshotlocalize

Merging in Erik's (me) most recent changes to the RasPi source code.