updated node_modules
simple ackrc
ignore _tmp_markdown.html
Revert "ignore _tmp_markdown.html" accidentally -am instead of just -m

This reverts commit f5fdff6a5739062c2cff9ba836dede19de6a7d62.
ignore _tmp_markdown.html
update grunt version dep in package.json
update ackrc
Merge branch 'master' of github.com:hellochar/twoguns

Conflicts:
	node_modules/express/LICENSE
	node_modules/express/node_modules/mkdirp/LICENSE
	node_modules/express/node_modules/mkdirp/index.js
	node_modules/express/node_modules/mkdirp/readme.markdown
	node_modules/express/node_modules/send/node_modules/mime/LICENSE
	node_modules/grunt/node_modules/colors/package.json
	node_modules/grunt/node_modules/eventemitter2/package.json
	node_modules/grunt/node_modules/exit/LICENSE-MIT
	node_modules/grunt/node_modules/getobject/LICENSE-MIT
	node_modules/grunt/node_modules/minimatch/node_modules/lru-cache/bench.js
	node_modules/grunt/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
	node_modules/grunt/node_modules/minimatch/node_modules/lru-cache/package.json
	node_modules/grunt/package.json