renaming inc/ to includes/, fixing grunt watch for compass, adding theme components