For all the people who have SSD's and run a jenkins manifest + a personal directory, this manifest is for you...
Merge branch 'jb2' of https://github.com/CarbonDev/android into q

Conflicts:
	default.xml
Q
yes im selfish.
Fix derp
Merge branch 'q' of github.com:CarbonDev/android into q
Add the Sony Peppercorn
Add needed piece
Add Sony Pepper!
Update default.xml
Merge branch 'q' into jb2

Conflicts:
	default.xml
Merge branch 'jb2' of git://github.com/CarbonDev/android into jb2

Conflicts:
	default.xml
Revert "Switch back to cm 10.1's NFC"

This reverts commit 2a255e7892ec187d3c3cd97792b97911aab890c9.