Resolve merge troubles. Add new train test params

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

Add objective and subjective object face scene classifiers to the params
file. These should really be two separate commits. Sorry.
add swp files to gitignore
Merge branch 'master' of https://github.com/tylerboyd/LTL