bulk update and cleanup
update
remove some more files and put back our nfc libs
oops
Merge pull request #6 from Joelz9614/cm-10.1-chad

Cleanup!!!
Merge branch 'jellybean-mr1', remote-tracking branch 'chad/cm-10.1-chad' into HEAD