Updates to make.conf, added android.keywords, and keywords for csvkit.
Merge of ultrabook changes.