Added some basic calendar functionaly, moved dev db into project ~/tmp/ instead of system root/tmp and made events table.  Also there's lots of lousy code in here
fixed merges