account for Gruntfile rename in grunt tasks
add logo and some badges to README
update quick install
move license into separate file
ignoring huge chunks of files from other branches
Merge remote-tracking branch 'upstream/master' into upstream

* upstream/master:
  move license into separate file
  update quick install
  add logo and some badges to README
  account for Gruntfile rename in grunt tasks
Merge branch 'upstream'

* upstream:
  ignoring huge chunks of files from other branches
  move license into separate file
  update quick install
  add logo and some badges to README
  account for Gruntfile rename in grunt tasks

Conflicts:
	Gruntfile.js