Remove from/import and update to PHP5.4.
Add some tests.
Merge branch 'from_import' into incoming