updating internal API for consistency with Grunt

@shama, how does this look to you? 

This merge will address #24 and #25.