Merging stuff

Started work on merging of this site with my home portal. Surprsingly, items from the bottom of TODO list do rise sometimes. :)