add merge to travis so we can verify before merge into master
add merge to travis so we can verify before merge into master

klahnakoski/ActiveData,maggienj/ActiveData,maggienj/ActiveData,maggienj/ActiveData,maggienj/ActiveData,klahnakoski/ActiveData,klahnakoski/ActiveData,klahnakoski/ActiveData