added a 'both' method that inits using EM

x -> x0 for MCMC loops (only matters if we removed fixed sites)
marginalize the theta proportions in MCMC for fp

+ added an assert to hdp