ignore swap files
add skype / schroot to larry
merge modules 'default' and 'desktop' into 'scripts'