fixes

Signed-off-by: Steve Lombardi <smlombardi@gmail.com>
Merge branch 'trunk' of https://github.com/smlombardi/HPC

Signed-off-by: Steve Lombardi <smlombardi@gmail.com>

Conflicts:
	custom.css.map
codekit file

Signed-off-by: Steve Lombardi <smlombardi@gmail.com>