gitignore fix
added .htaccess and merged action.php
merged index.php
merged the crystal theme
merged app.config.php as best I could, will need more refactoring later.
merged bootstrap.inc.php and codon.config.php
Pulled over some files we will need later.
merged over updated core classes
added in template files
refactored installation
fix