Back-merge documentation and fixes

format installation docs, add links
Add hdf5 requirements to 10.9 notes, drop cmake (not linked)
fix im2col height/width bound check bug (issue #284 identified by @kmatzen)
strip confusing confusing comment about shuffling files
add /etc/rc.local hint for boot configuration of gpus
Include k40 images per day benchmark
drop caffe presentation in favor of dropbox link
make build_docs.sh script work from anywhere
proofread, fix dead link, standardize NVIDIA capitalization
Added Link in index.md to perfomance_hardware.md
Added Performance and Hardware Tips
imagenet fix: ilvsrc -> ilsvrc

diff --cc docs/index.md
Simple merge

diff --cc docs/installation.md
Simple merge

diff --cc examples/imagenet/imagenet_train.prototxt
index b34a9b4,536d853..519d450
--- 1/examples/imagenet/imagenet_train.prototxt
--- 2/examples/imagenet/imagenet_train.prototxt
+++ b/examples/imagenet/imagenet_train.prototxt
@@@ -1,29 -1,23 +1,29 @@@
  name: "CaffeNet"
  layers {
 -  layer {
 -    name: "data"
 -    type: "data"
 +  name: "data"
 +  type: DATA
 +  top: "data"
 +  top: "label"
 +  data_param {
-     source: "ilvsrc12_train_leveldb"
+     source: "ilsvrc12_train_leveldb"
 -    meanfile: "../../data/ilsvrc12/imagenet_mean.binaryproto"
 -    batchsize: 256
 -    cropsize: 227
 +    mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
 +    batch_size: 256
 +    crop_size: 227
      mirror: true
    }
 -  top: "data"
 -  top: "label"
  }
  layers {
 -  layer {
 -    name: "conv1"
 -    type: "conv"
 +  name: "conv1"
 +  type: CONVOLUTION
 +  bottom: "data"
 +  top: "conv1"
 +  blobs_lr: 1
 +  blobs_lr: 2
 +  weight_decay: 1
 +  weight_decay: 0
 +  convolution_param {
      num_output: 96
 -    kernelsize: 11
 +    kernel_size: 11
      stride: 4
      weight_filler {
        type: "gaussian"

diff --cc examples/imagenet/imagenet_val.prototxt
index 2f1ead7,0a7a235..dd26f40
--- 1/examples/imagenet/imagenet_val.prototxt
--- 2/examples/imagenet/imagenet_val.prototxt
+++ b/examples/imagenet/imagenet_val.prototxt
@@@ -1,31 -1,33 +1,31 @@@
  name: "CaffeNet"
  layers {
 -  layer {
 -    name: "data"
 -    type: "data"
 +  name: "data"
 +  type: DATA
 +  top: "data"
 +  top: "label"
 +  data_param {
-     source: "ilvsrc12_val_leveldb"
+     source: "ilsvrc12_val_leveldb"
 -    meanfile: "../../data/ilsvrc12/imagenet_mean.binaryproto"
 -    batchsize: 50
 -    cropsize: 227
 +    mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
 +    batch_size: 50
 +    crop_size: 227
      mirror: false
    }
 -  top: "data"
 -  top: "label"
  }
  layers {
 -  layer {
 -    name: "conv1"
 -    type: "conv"
 +  name: "conv1"
 +  type: CONVOLUTION
 +  bottom: "data"
 +  top: "conv1"
 +  convolution_param {
      num_output: 96
 -    kernelsize: 11
 +    kernel_size: 11
      stride: 4
    }
 -  bottom: "data"
 -  top: "conv1"
  }
  layers {
 -  layer {
 -    name: "relu1"
 -    type: "relu"
 -  }
 +  name: "relu1"
 +  type: RELU
    bottom: "conv1"
    top: "conv1"
  }

diff --cc tools/convert_imageset.cpp
Simple merge