added kodiak_setup and create_kodiak_users.sql
fixed merge issue