Same as master

Same as master
Whitespace Formatting

I've got gVim working with the command shell, so I'm going to use that
for modifying files, then load the files into arduino to compile; I
kinda want to figure out if I can get arduino to run from via cli as
well...
Whitespace Formatting

Same commit; left out a file. Could go and append this to the previous
commit from the git shell, but meh; using the gui is faster
Started LineTrack_rev3
Merge to master from LineTrack