Merging dev branch into master branch

I've kept a copy of the original master branch as a new "basic" branch. The new master branch will include my recently added features, including charting of OBD2 data and CSV file exports.