Will amend this commit message later.
Changed require to include.
Merge branch 'master' of github.com:LiftUX/UpThemes-Framework
Fix for options.php

- fix for not defined upfw_get_current_tab() and
upfw_get_page_tab_markup() in the options.php file
Merge pull request #42 from TheX/master

Fix for not defined custom.php functions
Rewrote taxonomy drop-down code for displaying taxonomy selector.
Replacing Farbtastic color picker with Iris color picker.
Implemented new media management for image uploads (thanks @jthomasgriffin).
Add a quick check to make sure colorpicker exists.
Update js/up_framework.js

Comments for color picker credit.
Added WordPress' wp_editor() function to the list of available field types.
Merge pull request #46 from cointilt/master

Adding Wordpress' Editor and cleaning up whitespace.
Update options.php

Incrementing minor version number.
Removed white space.
Fixed fatal errore when first adding UpThemes Framework with no options set up yet.
Fixed theme options example where the color field was not an actual color field.
Added function to enable custom field types.
Merge pull request #51 from cointilt/master

Custom Field Type Hooks
Cleaning up some of the tab generation code.
Fixed spelling error in custom callback naming convention.