Updated and such

Updates as of end of meeting
Update Nov 8

Updated code from end of the November 8th, 2014 Saturday meeting.