Update for Mac OSx 10.9 compile + add matplot++