warp_to -> warp_to_mask
tidies warp_to_mask to always return masked
Image.as_masked and MaskedImage.as_unmasked, tests
rough idea of warp_to_shape working, tests fail
improve xy-yx flipping for skimage
test equivilence of warp_to_mask warp_to_shape,
fix Boolean order kwarg test
fit for aam passing interpolator incorrectly
Merge remote-tracking branch 'upstream/master' into warp_to_mask

Conflicts:
	menpo/fit/regression/trainer.py
Merge remote-tracking branch 'upstream/master' into warp_to_mask

Conflicts:
	menpo/fitmultilevel/aam/builder.py
Merge remote-tracking branch 'upstream/master' into warp_to_mask

Conflicts:
	menpo/fitmultilevel/aam/builder.py
	menpo/image/base.py
	menpo/image/boolean.py
fix to landmarks in boolean warp
lots of fixes
Merge remote-tracking branch 'upstream/master' into warp_to_mask

Conflicts:
	menpo/image/base.py
move menpo.image.feature -> menpo.feature
move features to menpo.features.feature
steps to remove featurefunctions
remove compute_features entirely
remove str option for functions in fitmultilevel
remove all .feature calls from Menpo