ignore vim .swp files
Merge remote-tracking branch 'upstream/master'
allow user to explicitly define Moodle root dir
correct typo
update gitignore .swp files
Merge pull request #124 from jobyh/master

Grunt fix for theme in non-standard location