Remove the comment out code.
Merge branch '1315' of github.com:openscholar/openscholar into 1315