edited for pg database
deleted sqlite from gemfile
cleaning up some issues
switch to pg database
fixing merge conflicts
updating gemfile.lock
Merge branch 'master' into pgmerge
fixed merge conflict
added cip import to a rake task