Merge remote-tracking branch 'upstream/master' into lk_fitter

Conflicts:
	menpo/fitmultilevel/fittingresult.py
	menpo/fitmultilevel/test/aam_fitter_test.py
renames LSintensity to SSD
removes hdf5able from atm
Merge pull request #469 from nontas/lk_fitter

Active Template Models
adds PointTree
Merge remote-tracking branch 'upstream/master' into graphs