Added try/catch block on importing of psycopg2, added custom query method
Merge branch 'master' of https://github.com/mrgeorge/BusTripper

Conflicts:
	BusTripper/io.py