Added Zack's pot changes
Added alignment consistency in ports.h
Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	ports.cpp