Updated gitignore
Merge branch 'master' into 02-restify