Release 1.1

Tons of weird fixes...

Got version control confused over several computers, fixed back to
normal (DO NOT USE RELEASE 1.0)