Pin grunt (so travis works).
merged with oesmith/master
#199, added behaveLikeLine and fillOpacity options, refactored morris.line to separate line and point draw operation
Merge branch '199-area' of https://github.com/tiraeth/morris.js

Conflicts:
	morris.min.js