fix secondary mask name in mvpa params
Merge branch 'master' of https://github.com/tylerboyd/LTL

Conflicts:
	univariate/LT_setcontrasts.m
Revert "fix secondary mask name in mvpa params"

This reverts commit f27c93b66dc442c10d13d6bec43ad448a79dec1b.
Resolve merge troubles

After a foolish journey through the forest of checkouts, resets,
reverts, i have pulled the xwing out of the swamp.