Fixed more twitter widget stuff
weird stuff happening
Merge branch 'Server' of https://github.com/AndrewBurian/DashboardAppliance into Server

Conflicts:
	data/clients.json