Fixed imports so nosetest can be run from the commandline, and works on travis
Merge remote-tracking branch 'origin/master'