Big Update 4/17

Does not include Nicks awesome changes
SQL update
Merge branch 'master' into master_nick