Merge pull request #135 from tsujigiri/tweak_user_snp_insertion

Don't join temp table with user_snps
Adds rstrip to 23andme parsing, since the old parser did this too
Remove genotype_id from temp table