include node_modules in gitignore
Merge branch 'grunt' into ignore_and_finish
move localStorage to alfredStorage