hopefully fixed the whole 'deploying from prs instead of only master'…#12

Merged

spacerockzero merged 2 commits intomasterfrom

Apr 23, 2017

Commits on Apr 23, 2017

hopefully fixed the whole 'deploying from prs instead of only master' problem.
spacerockzero
committed
disable travis deploy until we can stop pr's from doing it, too
spacerockzero
committed