Fixed various errors & issues. Added Gruntfile. Fixed README.md conflict.