Merge branch 'pipe_tp_fix' into improved_bruker_import
Merge branch 'pipe_fix' into improved_bruker_import
Added code to improve Bruker raw data import, mostly on 2D data:
bruker.py:
Automatic determination of: sw, nuc (label), carier (Hz), obs freq
(MHz), encoding type, digital filter info.

convert.py:
(optional) automatic removal of bruker digital filter
conversion of bruker encoding type to standard (QF -> magnitude, etc...)
re-sorting of echo-antiecho quadrature in 2D to complex 

pipe.py:
conversion of bruker encodings to pipe ('states-tppi' -> FDF1AQSIGN,
etc...)
Merge branch 'master' into improved_bruker_import

Bring the improved Bruker import code up to date with the fixes made to the pipe_proc module.
Fixed the new import code to pass all the standard tests.  Added a line in the test suite to create an acqu3s file for testing.
Added a MAC file to pipe_proc.  The only macro is currently the bruk_ranceY macro used for Rance-Kay type shuffling used in 2D PEP experiments.
Change auto logic in ft from FD2DPHASE == 0 or FD2DPHASE == 1 and fn != FDF2
to (FD2DPHASE == 0 or FD2DPHASE == 1) and fn != FDF2, so complex ft is still done on the direct dimension of datasets with real indirect dimensions.
 Reset the FDNDAQSIGN parameter after ft so sign alternation or negation doesn't get run twice.
Moved mixed mode integration tests to the to_fix test files.
Added a rudimentary macro interpreter, which is actually just a dispatch routine.  This was added so Rance-Kay shuffling of sensitivity enhanced data could be done.
Added a debug flag to print the detected flags in the ft command.
Tested the import code against local HMBC, phase-cycled HSQC and gradient seHSQC.
Addressed comments from pull request #19
-Fixed the docstring in bruk_ranceY
-Moved the dimension encoding logic to separate functions, and
-Changed the dimension encoding logic to give appropriate udic info, which let me
-Eliminated now redundant encoding translation code form the converter.

Also fixed:
-Adjusted the macro return call to pass keyword args correctly.
-FD2DPHASE maps correctly to 'image' and 'array' flags
Merge branch 'pr_19'

Closes PR #19

Conflicts:
	tests/pipe_proc_tests/2d_mixed_processing.py
Cleanup after pull request #19

* Fixed failing convert tests.
* Changed default behavior of from_bruker convert method to not remove
  digital filter, removed unused parameter.
* Refactored guess_udic function in nmrglue.bruker to better handle
  missing dictionary keys.
* Applied PEP8 style guide to all Python file in the nmrglue directory.
* Added new function to documentation.