Add laptop-specific changes
Merge branch 'master' of github.com:Indiv0/dotfiles into iridium
Add home configuration to wpa_supplicant
Enabled dropbox initialization
Remove root priveleges from scripts and rename to .sh files
Fixed iwrestart script
Merge branch 'master' of github.com:Indiv0/dotfiles into iridium
Removed redundant WPA script
Merge branch 'master' of github.com:Indiv0/dotfiles into iridium

Conflicts:
	.xinitrc
Merge branch 'master' of github.com:Indiv0/dotfiles into iridium
Merge branch 'master' of github.com:Indiv0/dotfiles into iridium
Remove old django script
Add laptop-specific changes
Add home configuration to wpa_supplicant
Remove root priveleges from scripts and rename to .sh files
Fixed iwrestart script
Removed redundant WPA script
Add ruby PATH export to .bashrc
Irssi autorun script
Add irssi config