Catchup!

Still gotta figure out a better way to maintain some of this.. It's
getting a bit unruly, and it's kinda worthless to have elpa stuff
checked in? Maybe?

Signed-off-by: jmickey <jmickey@netapp.com>