Standardized function and variable naming convention, cleaned up function comments
Small compile error fix
Merge pull request #5 from osrf/shutdown_segfault_fix

Shutdown segfault fix
Merged branches and more small cleanups