Armored car .json style take 3 (I think?)

I didn't realize while I was working on porting over the armored car that the reinforced windshield was already in master, since I started my branch before it got added.  To try to make things less confusing, I'm closing my old PR and opening a new one so I have the new windshield to work with in-game.  This has the complete armored vehicle in the json file, but it doesn't have the mapgen.cpp changes to make this appear randomly in game.  This should be summonable with the wish menu though, so feel free to test it.  I can't get Cata to compile right now (there seems to be some sort of problem in bionics.cpp), so I can't test this myself.  I see no reason this shouldn't work though.