removing resque from the master branch, it has now its own branch
move dev tools to the bottom
Merge branch 'master' into devise

Conflicts:
	Gemfile.lock