Merge branch 'master' of /home/dylan/WebstormProjects/Ramble with conflicts.
Corrected require path.