change dropbox to owncloud
change key bind for toggle touchpad
Merge remote-tracking branch 'refs/remotes/origin/master' into laptop

Conflicts:
	xmonad.hs