Hack fixes to get things working in instant WP. This build currently works in instant WP. It will absolutely not work anywhere else.
Merge branch 'dev' of github.com:jdarling91/hci_proj into instant_wp