Bunch'o cosmetic changes

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Merge branch 'master' of https://github.com/openlectures/ol2

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>

Conflicts:
	Gemfile.lock