Add map and filter module.
Correct paths to requirejs dependencies.
Revert Procfile.
Merge with upstream repository.
Merge pull request #9 from cjmarsh/master

Map and filter module
added functionality to retrieve kipps clips
Fixing merge issue
removing error conflicts
Merge remote-tracking branch 'upstream/master'