local config changes
Merge branch 'master' into googlenet