Adding a point of Genie integration, and updating log4j dependency
walk the inheritance hierarchy to get map and reduce stores since there is a level of indirection added to support the forthcoming Pig 0.12
fix spelling
fix typo in method name
Merge remote-tracking branch 'upstream/master'
Now using LIPSTICK_UUID_PROP for uuids
Merge pull request #27 from sriramkrishnan/master

Adding a point of Genie integration, and updating log4j dependency
Merge pull request #29 from mortardata/upstream_staging_sample_data_follow_inheritance

Walk inheritance tree when dynamically grabbing attributes
Merge branch 'master' into local_mode_jobtiming

Conflicts:
	lipstick-console/src/main/java/com/netflix/lipstick/pigtolipstick/BasicP2LClient.java