Merge dev (20141212-1)

Generalized sensor payload data for use with other sensor types in the future.