Replacing tf.contrib.data.batch_and_drop_remainder by batch(...,...

Replacing tf.contrib.data.batch_and_drop_remainder by batch(..., drop_remainder=True). Also checkpointing at (epoch + 1) % x while saving the model to consider the last epoch's variables.