Cleaned up dupfiles, added default function
Merge branch 'master' of singapore.dreamhost.com:narthex