changed the opening port in gruntfile.js
rm .DS_Store from the config
just a pull and merge, no changes from me, refer to Mikeys last message