read through the github commit log's and files and extracted as many changes that i could to make the merge work better.  Still can't get stocks to work -.-  sorry Luke...