Removed several committed conflicting files;

PLEASE STOP DOING THIS;
Merge branch 'master' of https://github.com/ifdm/siphon
Removed all the conficts again;