Moved Qt imports to its own file (fixed #29)_
Merge branch 'master' of https://github.com/nycz/Kalpana
Merge branch 'master' into plugins

Removed nano command from conflict
Conflicts:
	terminal.py