Attempting to fix #43
Grunt files added
node_modules added to .gitignore
node_modules added to .gitignore
Merge branch 'master' of https://github.com/prometheansacrifice/PykCharts
Update README.md - installation instructions added for grunt
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	Gruntfile.js
	pykcharts/res/js/river.js
Gruntfile modified: Distro files now have version numbers in their filename
Jshint task added to Grunt
Resolving conflicts in river and gruntfile
Merge branch 'master' of github.com:pykih/PykCharts