2014 reboot

Starting up for 2014, untold number of changes mainly around ints to
shorts.