3 merge changes from pdeu

merges changes from pdeu. 
upgrades template to work with latest CKAN UI. 
closes #3.