Undo incorrectly handled merge conflict in the achievements controller from Coursemology/coursemology.org#126.

References Coursemology/coursemology.org#100.