Merge pull request #452 from am11/master

Feature: Supports indented code with stdin or data
Added some more keywords to package.json
Merge pull request #454 from sass/add-keywords

Added some more keywords to package.json
Code: Updated to latest master and fixed a test.