Fixed merge errors
Removed locomote.min.js from excluded files