swap ctrl/caps on laptop
merging oddities
diff path for wallpaper on laptop
fix path for ruby gems
color change, floating change
minor change
changes from desktop
new year
merge laptop changes
merge laptop changes