ImageNet tutorial update to merged train_val.prototext

I updated the ImageNet tutorial to reflect the new merged train_val.prototext format. Also fixed other minor problems.