Interim checkin. Switching from C to C++ to make some strings stuff less cumbersome
Merge branch 'master' of github.com:BleuLlama/msf-tools
Updated to merge