Revert "Revert "Merge branch 'master' into afro""

This reverts commit 0b0e97a71fdcd304c1201505bd4fab7517cb1706.
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
fixed problem wherein 5 extra pixels were displayed at the bottom
Merge branch 'master' into afro
Merge branch 'master' into afro
merged master, fixed conflict
fixed conflicts and merged master
Merge branch 'master' into afro
merged master and fixed conflicts
updated map
minor ui update
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'master' into afro
Merge branch 'afro' of github.com:knagra/farnsworth into afro
Merge branch 'master' into afro
Merge branch 'master' into afro