mac updates
Merge branch 'ndev_convimg' of https://github.com/nicodjimenez/caffe into ndev_convimg
mac updates renameing